From c802b47c27be15f0b93452e9eaa2fa4c1e01e9dd Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 14 Jan 2022 16:56:57 +0800
Subject: [PATCH 01/63] =?UTF-8?q?=E5=8D=83=E6=A0=A1=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E5=90=88=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/repo.go                    |  75 ++++++++----
 models/repo_list.go               |  21 ++++
 modules/auth/repo_form.go         |  12 ++
 modules/repository/create.go      |  10 +-
 options/locale/locale_en-US.ini   |   8 ++
 options/locale/locale_zh-CN.ini   |   8 ++
 routers/home.go                   |  65 ++--------
 routers/org/home.go               |  41 ++++++-
 routers/org/members.go            |  10 +-
 routers/org/teams.go              |  11 +-
 routers/repo/course.go            | 189 ++++++++++++++++++++++++++++++
 routers/routes/routes.go          |   7 ++
 services/repository/repository.go |  83 ++++++++++++-
 13 files changed, 447 insertions(+), 93 deletions(-)
 create mode 100644 routers/repo/course.go

diff --git a/models/repo.go b/models/repo.go
index 8ba48f7a3a..93e2cb140e 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -140,6 +140,7 @@ func NewRepoContext() {
 // RepositoryStatus defines the status of repository
 type RepositoryStatus int
 type RepoBlockChainStatus int
+type RepoType int
 
 // all kinds of RepositoryStatus
 const (
@@ -153,6 +154,11 @@ const (
 	RepoBlockChainFailed
 )
 
+const (
+	RepoNormal RepoType = iota
+	RepoCourse
+)
+
 // Repository represents a git repository.
 type Repository struct {
 	ID                  int64 `xorm:"pk autoincr"`
@@ -166,7 +172,8 @@ type Repository struct {
 	OriginalServiceType api.GitServiceType `xorm:"index"`
 	OriginalURL         string             `xorm:"VARCHAR(2048)"`
 	DefaultBranch       string
-
+	CreatorID           int64 `xorm:"INDEX NOT NULL  DEFAULT 0"`
+	Creator             *User `xorm:"-"`
 	NumWatches          int
 	NumStars            int
 	NumForks            int
@@ -175,11 +182,12 @@ type Repository struct {
 	NumOpenIssues       int `xorm:"-"`
 	NumPulls            int
 	NumClosedPulls      int
-	NumOpenPulls        int   `xorm:"-"`
-	NumMilestones       int   `xorm:"NOT NULL DEFAULT 0"`
-	NumClosedMilestones int   `xorm:"NOT NULL DEFAULT 0"`
-	NumOpenMilestones   int   `xorm:"-"`
-	NumCommit           int64 `xorm:"NOT NULL DEFAULT 0"`
+	NumOpenPulls        int      `xorm:"-"`
+	NumMilestones       int      `xorm:"NOT NULL DEFAULT 0"`
+	NumClosedMilestones int      `xorm:"NOT NULL DEFAULT 0"`
+	NumOpenMilestones   int      `xorm:"-"`
+	NumCommit           int64    `xorm:"NOT NULL DEFAULT 0"`
+	RepoType            RepoType `xorm:"NOT NULL DEFAULT 0"`
 
 	IsPrivate  bool `xorm:"INDEX"`
 	IsEmpty    bool `xorm:"INDEX"`
@@ -1035,6 +1043,8 @@ type CreateRepoOptions struct {
 	IsMirror       bool
 	AutoInit       bool
 	Status         RepositoryStatus
+	IsCourse       bool
+	Topics         []string
 }
 
 // GetRepoInitFile returns repository init files
@@ -1080,7 +1090,7 @@ func IsUsableRepoAlias(name string) error {
 }
 
 // CreateRepository creates a repository for the user/organization.
-func CreateRepository(ctx DBContext, doer, u *User, repo *Repository) (err error) {
+func CreateRepository(ctx DBContext, doer, u *User, repo *Repository, opts ...CreateRepoOptions) (err error) {
 	if err = IsUsableRepoName(repo.Name); err != nil {
 		return err
 	}
@@ -1094,7 +1104,10 @@ func CreateRepository(ctx DBContext, doer, u *User, repo *Repository) (err error
 	} else if has {
 		return ErrRepoAlreadyExist{u.Name, repo.Name}
 	}
-
+	isCourse := isCourse(opts)
+	if isCourse {
+		repo.CreatorID = doer.ID
+	}
 	if _, err = ctx.e.Insert(repo); err != nil {
 		return err
 	}
@@ -1128,17 +1141,23 @@ func CreateRepository(ctx DBContext, doer, u *User, repo *Repository) (err error
 				Config: &PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true},
 			})
 		} else if tp == UnitTypeDatasets {
-			units = append(units, RepoUnit{
-				RepoID: repo.ID,
-				Type:   tp,
-				Config: &DatasetConfig{EnableDataset: true},
-			})
+			if !isCourse {
+				units = append(units, RepoUnit{
+					RepoID: repo.ID,
+					Type:   tp,
+					Config: &DatasetConfig{EnableDataset: true},
+				})
+			}
+
 		} else if tp == UnitTypeCloudBrain {
-			units = append(units, RepoUnit{
-				RepoID: repo.ID,
-				Type:   tp,
-				Config: &CloudBrainConfig{EnableCloudBrain: true},
-			})
+			if !isCourse {
+				units = append(units, RepoUnit{
+					RepoID: repo.ID,
+					Type:   tp,
+					Config: &CloudBrainConfig{EnableCloudBrain: true},
+				})
+			}
+
 		} else if tp == UnitTypeBlockChain {
 			units = append(units, RepoUnit{
 				RepoID: repo.ID,
@@ -1146,11 +1165,13 @@ func CreateRepository(ctx DBContext, doer, u *User, repo *Repository) (err error
 				Config: &BlockChainConfig{EnableBlockChain: true},
 			})
 		} else if tp == UnitTypeModelManage {
-			units = append(units, RepoUnit{
-				RepoID: repo.ID,
-				Type:   tp,
-				Config: &ModelManageConfig{EnableModelManage: true},
-			})
+			if !isCourse {
+				units = append(units, RepoUnit{
+					RepoID: repo.ID,
+					Type:   tp,
+					Config: &ModelManageConfig{EnableModelManage: true},
+				})
+			}
 		} else {
 			units = append(units, RepoUnit{
 				RepoID: repo.ID,
@@ -1220,6 +1241,14 @@ func CreateRepository(ctx DBContext, doer, u *User, repo *Repository) (err error
 	return nil
 }
 
+func isCourse(opts []CreateRepoOptions) bool {
+	var isCourse = false
+	if len(opts) > 0 {
+		isCourse = opts[0].IsCourse
+	}
+	return isCourse
+}
+
 func countRepositories(userID int64, private bool) int64 {
 	sess := x.Where("id > 0")
 
diff --git a/models/repo_list.go b/models/repo_list.go
index e41b0f49d8..6fb9380dea 100755
--- a/models/repo_list.go
+++ b/models/repo_list.go
@@ -48,9 +48,12 @@ func (repos RepositoryList) loadAttributes(e Engine) error {
 
 	set := make(map[int64]struct{})
 	repoIDs := make([]int64, len(repos))
+	setCreator := make(map[int64]struct{})
 	for i := range repos {
 		set[repos[i].OwnerID] = struct{}{}
 		repoIDs[i] = repos[i].ID
+		setCreator[repos[i].CreatorID] = struct{}{}
+
 	}
 
 	// Load owners.
@@ -61,8 +64,18 @@ func (repos RepositoryList) loadAttributes(e Engine) error {
 		Find(&users); err != nil {
 		return fmt.Errorf("find users: %v", err)
 	}
+	//Load creator
+	creators := make(map[int64]*User, len(set))
+	if err := e.
+		Where("id > 0").
+		In("id", keysInt64(setCreator)).
+		Find(&creators); err != nil {
+		return fmt.Errorf("find create repo users: %v", err)
+	}
+
 	for i := range repos {
 		repos[i].Owner = users[repos[i].OwnerID]
+		repos[i].Creator = creators[repos[i].CreatorID]
 	}
 
 	// Load primary language.
@@ -174,6 +187,10 @@ type SearchRepoOptions struct {
 	// True -> include just has milestones
 	// False -> include just has no milestone
 	HasMilestones util.OptionalBool
+	// None -> include all repos
+	// True -> include just courses
+	// False -> include just no courses
+	Course util.OptionalBool
 }
 
 //SearchOrderBy is used to sort the result
@@ -351,6 +368,10 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
 		cond = cond.And(builder.Eq{"is_mirror": opts.Mirror == util.OptionalBoolTrue})
 	}
 
+	if opts.Course == util.OptionalBoolTrue {
+		cond = cond.And(builder.Eq{"repo_type": RepoCourse})
+	}
+
 	if opts.Actor != nil && opts.Actor.IsRestricted {
 		cond = cond.And(accessibleRepositoryCondition(opts.Actor))
 	}
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 32890a5c1e..c113aa8902 100755
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -728,3 +728,15 @@ type DeadlineForm struct {
 func (f *DeadlineForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }
+
+type CreateCourseForm struct {
+	RepoName    string `binding:"Required;AlphaDashDot;MaxSize(100)"`
+	Alias       string `binding:"Required;MaxSize(100);AlphaDashDotChinese"`
+	Topics      string
+	Description string `binding:"MaxSize(1024)"`
+}
+
+// Validate validates the fields
+func (f *CreateCourseForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+	return validate(errs, ctx.Data, f, ctx.Locale)
+}
diff --git a/modules/repository/create.go b/modules/repository/create.go
index f5dfa63d67..2a24cb7086 100644
--- a/modules/repository/create.go
+++ b/modules/repository/create.go
@@ -22,6 +22,10 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
 			Limit: u.MaxRepoCreation,
 		}
 	}
+	var RepoType = models.RepoNormal
+	if opts.IsCourse {
+		RepoType = models.RepoCourse
+	}
 
 	repo := &models.Repository{
 		OwnerID:                         u.ID,
@@ -38,10 +42,14 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
 		CloseIssuesViaCommitInAnyBranch: setting.Repository.DefaultCloseIssuesViaCommitsInAnyBranch,
 		Status:                          opts.Status,
 		IsEmpty:                         !opts.AutoInit,
+		RepoType:                        RepoType,
 	}
 
 	err = models.WithTx(func(ctx models.DBContext) error {
-		if err = models.CreateRepository(ctx, doer, u, repo); err != nil {
+		if err = models.CreateRepository(ctx, doer, u, repo, opts); err != nil {
+			return err
+		}
+		if err = models.SaveTopics(repo.ID, opts.Topics...); err != nil {
 			return err
 		}
 
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0b3bb1792b..1756b9533d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -50,6 +50,7 @@ repository = Repository
 organization = Organization
 mirror = Mirror
 new_repo = New Repository
+new_course=Publish Course
 new_migrate = New Migration
 new_dataset = New Dataset
 edit_dataset = Edit Dataset
@@ -390,6 +391,7 @@ lang_select_error = Select a language from the list.
 
 username_been_taken = The username is already taken.
 repo_name_been_taken = The repository name or path is already used.
+course_name_been_taken=The course path is already used.
 visit_rate_limit = Remote visit addressed rate limitation.
 2fa_auth_required = Remote visit required two factors authentication.
 org_name_been_taken = The organization name is already taken.
@@ -802,6 +804,8 @@ readme = README
 readme_helper = Select a README file template.
 auto_init = Initialize Repository (Adds .gitignore, License and README)
 create_repo = Create Repository
+create_course = Publish Course
+failed_to_create_course=Fail to publish course, please try again later.
 default_branch = Default Branch
 mirror_prune = Prune
 mirror_prune_desc = Remove obsolete remote-tracking references
@@ -968,8 +972,12 @@ archive.issue.nocomment = This repo is archived. You cannot comment on issues.
 archive.pull.nocomment = This repo is archived. You cannot comment on pull requests.
 
 form.reach_limit_of_creation = You have already reached your limit of %d repositories.
+form.reach_limit_of_course_creation=You have already reached your limit of %d courses or repositories.
 form.name_reserved = The repository name '%s' is reserved.
+form.course_name_reserved=The course name '%s' is reserved.
 form.name_pattern_not_allowed = The pattern '%s' is not allowed in a repository name.
+form.course_name_pattern_not_allowed=The pattern '%s' is not allowed in a course name.
+add_course_org_fail=Fail to add organization, please try again later.
 
 need_auth = Clone Authorization
 migrate_type = Migration Type
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index d5eac032b1..d034b17220 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -50,6 +50,7 @@ repository=项目
 organization=组织
 mirror=镜像
 new_repo=创建项目
+new_course=发布课程
 new_dataset=创建数据集
 new_migrate=迁移外部项目
 edit_dataset = Edit Dataset
@@ -395,6 +396,7 @@ lang_select_error=从列表中选出语言
 
 username_been_taken=用户名已被使用。
 repo_name_been_taken=项目名称或项目路径已被使用。
+course_name_been_taken=课程名称或路径已被使用。
 visit_rate_limit=远程访问达到速度限制。
 2fa_auth_required=远程访问需要双重验证。
 org_name_been_taken=组织名称已被使用。
@@ -808,6 +810,8 @@ readme=自述
 readme_helper=选择自述文件模板。
 auto_init=初始化存储库 (添加. gitignore、许可证和自述文件)
 create_repo=创建项目
+create_course=发布课程
+failed_to_create_course=发布课程失败，请稍后再试。
 default_branch=默认分支
 mirror_prune=修剪
 mirror_prune_desc=删除过时的远程跟踪引用
@@ -980,8 +984,12 @@ archive.issue.nocomment=此项目已存档，您不能在此任务添加评论
 archive.pull.nocomment=此项目已存档，您不能在此合并请求添加评论。
 
 form.reach_limit_of_creation=你已经达到了您的 %d 项目的限制。
+form.reach_limit_of_course_creation=你已经达到了您的 %d 课程的限制。
 form.name_reserved=项目名称 '%s' 是被保留的。
+form.course_name_reserved=课程名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=项目名称中不允许使用模式 "%s"。
+form.course_name_pattern_not_allowed=课程名称中不允许使用模式 "%s"。
+add_course_org_fail=加入组织失败，请稍后重试。
 
 need_auth=需要授权验证
 migrate_type=迁移类型
diff --git a/routers/home.go b/routers/home.go
index 24de1a10c2..397e1990dd 100755
--- a/routers/home.go
+++ b/routers/home.go
@@ -7,11 +7,11 @@ package routers
 
 import (
 	"bytes"
-	"fmt"
-	"io/ioutil"
 	"net/http"
 	"strings"
 
+	"code.gitea.io/gitea/services/repository"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -133,6 +133,7 @@ type RepoSearchOptions struct {
 	Restricted bool
 	PageSize   int
 	TplName    base.TplName
+	Course     util.OptionalBool
 }
 
 var (
@@ -211,6 +212,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		AllLimited:         true,
 		TopicName:          topic,
 		IncludeDescription: setting.UI.SearchRepoDescription,
+		Course:             opts.Course,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
@@ -559,7 +561,7 @@ func NotFound(ctx *context.Context) {
 
 func RecommendOrgFromPromote(ctx *context.Context) {
 	url := setting.RecommentRepoAddr + "organizations"
-	result, err := recommendFromPromote(url)
+	result, err := repository.RecommendFromPromote(url)
 	if err != nil {
 		ctx.ServerError("500", err)
 		return
@@ -586,62 +588,11 @@ func RecommendOrgFromPromote(ctx *context.Context) {
 	ctx.JSON(200, resultOrg)
 }
 
-func recommendFromPromote(url string) ([]string, error) {
-	resp, err := http.Get(url)
-	if err != nil || resp.StatusCode != 200 {
-		log.Info("Get organizations url error=" + err.Error())
-		return nil, err
-	}
-	bytes, err := ioutil.ReadAll(resp.Body)
-	resp.Body.Close()
-	if err != nil {
-		log.Info("Get organizations url error=" + err.Error())
-		return nil, err
-	}
-
-	allLineStr := string(bytes)
-	lines := strings.Split(allLineStr, "\n")
-	result := make([]string, len(lines))
-	for i, line := range lines {
-		log.Info("i=" + fmt.Sprint(i) + " line=" + line)
-		result[i] = strings.Trim(line, " ")
-	}
-	return result, nil
-}
-
 func RecommendRepoFromPromote(ctx *context.Context) {
-	url := setting.RecommentRepoAddr + "projects"
-	result, err := recommendFromPromote(url)
+	result, err := repository.GetRecommendRepoFromPromote("projects")
 	if err != nil {
 		ctx.ServerError("500", err)
-		return
-	}
-	resultRepo := make([]map[string]interface{}, 0)
-	//resultRepo := make([]*models.Repository, 0)
-	for _, repoName := range result {
-		tmpIndex := strings.Index(repoName, "/")
-		if tmpIndex == -1 {
-			log.Info("error repo name format.")
-		} else {
-			ownerName := strings.Trim(repoName[0:tmpIndex], " ")
-			repoName := strings.Trim(repoName[tmpIndex+1:], " ")
-			repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
-			if err == nil {
-				repoMap := make(map[string]interface{})
-				repoMap["ID"] = fmt.Sprint(repo.ID)
-				repoMap["Name"] = repo.Name
-				repoMap["OwnerName"] = repo.OwnerName
-				repoMap["NumStars"] = repo.NumStars
-				repoMap["NumForks"] = repo.NumForks
-				repoMap["Description"] = repo.Description
-				repoMap["NumWatchs"] = repo.NumWatches
-				repoMap["Topics"] = repo.Topics
-				repoMap["Avatar"] = repo.RelAvatarLink()
-				resultRepo = append(resultRepo, repoMap)
-			} else {
-				log.Info("query repo error," + err.Error())
-			}
-		}
+	} else {
+		ctx.JSON(200, result)
 	}
-	ctx.JSON(200, resultRepo)
 }
diff --git a/routers/org/home.go b/routers/org/home.go
index df600d96d7..4c350d352f 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -7,6 +7,10 @@ package org
 import (
 	"strings"
 
+	"code.gitea.io/gitea/services/repository"
+
+	"code.gitea.io/gitea/modules/util"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -14,7 +18,8 @@ import (
 )
 
 const (
-	tplOrgHome base.TplName = "org/home"
+	tplOrgHome       base.TplName = "org/home"
+	tplOrgCourseHome base.TplName = "org/home_courses"
 )
 
 // Home show organization home page
@@ -59,10 +64,16 @@ func Home(ctx *context.Context) {
 	case "fewestforks":
 		orderBy = models.SearchOrderByForks
 	default:
-		ctx.Data["SortType"] = "recentupdate"
-		orderBy = models.SearchOrderByRecentUpdated
-	}
+		if setting.Course.OrgName == org.Name {
+			ctx.Data["SortType"] = "newest"
+			orderBy = models.SearchOrderByNewest
 
+		} else {
+			ctx.Data["SortType"] = "recentupdate"
+			orderBy = models.SearchOrderByRecentUpdated
+		}
+	}
+	orderBy = orderBy + ",id"
 	keyword := strings.Trim(ctx.Query("q"), " ")
 	ctx.Data["Keyword"] = keyword
 
@@ -76,9 +87,21 @@ func Home(ctx *context.Context) {
 		count int64
 		err   error
 	)
+	pageSize := setting.UI.User.RepoPagingNum
+	var CourseOptional util.OptionalBool = util.OptionalBoolNone
+	if setting.Course.OrgName == org.Name {
+		pageSize = 15
+		CourseOptional = util.OptionalBoolTrue
+		recommendCourses, _ := repository.GetRecommendRepoFromPromote("courses")
+		ctx.Data["RecommendCourses"] = recommendCourses
+		recommendCourseKeyWords, _ := repository.GetRecommendCourseKeyWords()
+		ctx.Data["CoursesKeywords"] = recommendCourseKeyWords
+
+	}
+
 	repos, count, err = models.SearchRepository(&models.SearchRepoOptions{
 		ListOptions: models.ListOptions{
-			PageSize: setting.UI.User.RepoPagingNum,
+			PageSize: pageSize,
 			Page:     page,
 		},
 		Keyword:            keyword,
@@ -87,6 +110,7 @@ func Home(ctx *context.Context) {
 		Private:            ctx.IsSigned,
 		Actor:              ctx.User,
 		IncludeDescription: setting.UI.SearchRepoDescription,
+		Course:             CourseOptional,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
@@ -138,5 +162,10 @@ func Home(ctx *context.Context) {
 	}
 
 	ctx.Data["tags"] = tags
-	ctx.HTML(200, tplOrgHome)
+	if setting.Course.OrgName == org.Name {
+		ctx.HTML(200, tplOrgCourseHome)
+	} else {
+		ctx.HTML(200, tplOrgHome)
+	}
+
 }
diff --git a/routers/org/members.go b/routers/org/members.go
index 9f13d1be3f..39df692d27 100755
--- a/routers/org/members.go
+++ b/routers/org/members.go
@@ -17,7 +17,8 @@ import (
 
 const (
 	// tplMembers template for organization members page
-	tplMembers base.TplName = "org/member/members"
+	tplMembers       base.TplName = "org/member/members"
+	tplCourseMembers base.TplName = "org/member/course_members"
 )
 
 // Members render organization users page
@@ -64,8 +65,11 @@ func Members(ctx *context.Context) {
 	ctx.Data["MembersIsPublicMember"] = membersIsPublic
 	ctx.Data["MembersIsUserOrgOwner"] = members.IsUserOrgOwner(org.ID)
 	ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus()
-
-	ctx.HTML(200, tplMembers)
+	if setting.Course.OrgName == org.Name {
+		ctx.HTML(200, tplCourseMembers)
+	} else {
+		ctx.HTML(200, tplMembers)
+	}
 }
 
 // MembersAction response for operation to a member of organization
diff --git a/routers/org/teams.go b/routers/org/teams.go
index 03fbf068da..8aa3e39473 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -10,6 +10,8 @@ import (
 	"path"
 	"strings"
 
+	"code.gitea.io/gitea/modules/setting"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
@@ -22,7 +24,8 @@ import (
 
 const (
 	// tplTeams template path for teams list page
-	tplTeams base.TplName = "org/team/teams"
+	tplTeams       base.TplName = "org/team/teams"
+	tplCourseTeams base.TplName = "org/team/courseTeams"
 	// tplTeamNew template path for create new team page
 	tplTeamNew base.TplName = "org/team/new"
 	// tplTeamMembers template path for showing team members page
@@ -44,8 +47,12 @@ func Teams(ctx *context.Context) {
 		}
 	}
 	ctx.Data["Teams"] = org.Teams
+	if setting.Course.OrgName == org.Name {
+		ctx.HTML(200, tplCourseTeams)
+	} else {
+		ctx.HTML(200, tplTeams)
+	}
 
-	ctx.HTML(200, tplTeams)
 }
 
 // TeamsAction response for join, leave, remove, add operations to team
diff --git a/routers/repo/course.go b/routers/repo/course.go
new file mode 100644
index 0000000000..b8f39817b0
--- /dev/null
+++ b/routers/repo/course.go
@@ -0,0 +1,189 @@
+package repo
+
+import (
+	"net/http"
+	"strings"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/auth"
+	"code.gitea.io/gitea/modules/base"
+	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+	repo_service "code.gitea.io/gitea/services/repository"
+)
+
+const (
+	tplCreateCourse base.TplName = "repo/createCourse"
+)
+
+func CreateCourse(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("new_course")
+
+	ctx.Data["Owner"] = setting.Course.OrgName
+
+	ctx.HTML(200, tplCreateCourse)
+
+}
+
+func CreateCoursePost(ctx *context.Context, form auth.CreateCourseForm) {
+	ctx.Data["Title"] = ctx.Tr("new_course")
+
+	if ctx.Written() {
+		return
+	}
+
+	var topics = make([]string, 0)
+	var topicsStr = strings.TrimSpace(form.Topics)
+	if len(topicsStr) > 0 {
+		topics = strings.Split(topicsStr, ",")
+	}
+
+	validTopics, invalidTopics := models.SanitizeAndValidateTopics(topics)
+
+	if len(validTopics) > 25 {
+		ctx.RenderWithErr(ctx.Tr("repo.topic.count_prompt"), tplCreateCourse, form)
+		return
+	}
+
+	if len(invalidTopics) > 0 {
+		ctx.RenderWithErr(ctx.Tr("repo.topic.format_prompt"), tplCreateCourse, form)
+		return
+	}
+
+	var repo *models.Repository
+	var err error
+
+	if setting.Course.OrgName == "" || setting.Course.TeamName == "" {
+		log.Error("then organization name or team name of course is empty.")
+		ctx.RenderWithErr(ctx.Tr("repo.failed_to_create_course"), tplCreateCourse, form)
+		return
+	}
+
+	org, team, err := getOrgAndTeam()
+
+	if err != nil {
+		log.Error("Failed to get team from db.", err)
+		ctx.RenderWithErr(ctx.Tr("repo.failed_to_create_course"), tplCreateCourse, form)
+		return
+	}
+	isInTeam, err := models.IsUserInTeams(ctx.User.ID, []int64{team.ID})
+	if err != nil {
+		log.Error("Failed to get user in team from db.")
+		ctx.RenderWithErr(ctx.Tr("repo.failed_to_create_course"), tplCreateCourse, form)
+		return
+	}
+
+	if !isInTeam {
+		err = models.AddTeamMember(team, ctx.User.ID)
+		if err != nil {
+			log.Error("Failed to add user to team.")
+			ctx.RenderWithErr(ctx.Tr("repo.failed_to_create_course"), tplCreateCourse, form)
+			return
+		}
+	}
+
+	if ctx.HasError() {
+		ctx.HTML(200, tplCreateCourse)
+		return
+	}
+
+	repo, err = repo_service.CreateRepository(ctx.User, org, models.CreateRepoOptions{
+		Name:          form.RepoName,
+		Alias:         form.Alias,
+		Description:   form.Description,
+		Gitignores:    "",
+		IssueLabels:   "",
+		License:       "",
+		Readme:        "Default",
+		IsPrivate:     false,
+		DefaultBranch: "master",
+		AutoInit:      true,
+		IsCourse:      true,
+		Topics:        validTopics,
+	})
+	if err == nil {
+		log.Trace("Repository created [%d]: %s/%s", repo.ID, org.Name, repo.Name)
+		ctx.Redirect(setting.AppSubURL + "/" + org.Name + "/" + repo.Name)
+		return
+	}
+
+	handleCreateCourseError(ctx, org, err, "CreateCoursePost", tplCreateCourse, &form)
+}
+
+func AddCourseOrg(ctx *context.Context) {
+
+	_, team, err := getOrgAndTeam()
+
+	if err != nil {
+		log.Error("Failed to get team from db.", err)
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"code":    1,
+			"message": ctx.Tr("repo.addCourseOrgFail"),
+		})
+		return
+	}
+	isInTeam, err := models.IsUserInTeams(ctx.User.ID, []int64{team.ID})
+	if err != nil {
+		log.Error("Failed to get user in team from db.", err)
+		ctx.JSON(http.StatusOK, map[string]interface{}{
+			"code":    1,
+			"message": ctx.Tr("repo.add_course_org_fail"),
+		})
+		return
+	}
+
+	if !isInTeam {
+		err = models.AddTeamMember(team, ctx.User.ID)
+		if err != nil {
+			log.Error("Failed to add user to team.", err)
+			ctx.JSON(http.StatusOK, map[string]interface{}{
+				"code":    1,
+				"message": ctx.Tr("repo.add_course_org_fail"),
+			})
+			return
+		}
+	}
+
+	ctx.JSON(http.StatusOK, map[string]interface{}{
+		"code":    0,
+		"message": "",
+	})
+
+}
+
+func getOrgAndTeam() (*models.User, *models.Team, error) {
+	org, err := models.GetUserByName(setting.Course.OrgName)
+
+	if err != nil {
+		log.Error("Failed to get organization from db.", err)
+		return nil, nil, err
+	}
+
+	team, err := models.GetTeam(org.ID, setting.Course.TeamName)
+
+	if err != nil {
+		log.Error("Failed to get team from db.", err)
+
+		return nil, nil, err
+	}
+	return org, team, nil
+}
+
+func handleCreateCourseError(ctx *context.Context, owner *models.User, err error, name string, tpl base.TplName, form interface{}) {
+	switch {
+	case models.IsErrReachLimitOfRepo(err):
+		ctx.RenderWithErr(ctx.Tr("repo.form.reach_limit_of_course_creation", owner.MaxCreationLimit()), tpl, form)
+	case models.IsErrRepoAlreadyExist(err):
+		ctx.Data["Err_RepoName"] = true
+		ctx.RenderWithErr(ctx.Tr("form.course_name_been_taken"), tpl, form)
+	case models.IsErrNameReserved(err):
+		ctx.Data["Err_RepoName"] = true
+		ctx.RenderWithErr(ctx.Tr("repo.form.course_name_reserved", err.(models.ErrNameReserved).Name), tpl, form)
+	case models.IsErrNamePatternNotAllowed(err):
+		ctx.Data["Err_RepoName"] = true
+		ctx.RenderWithErr(ctx.Tr("repo.form.course_name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tpl, form)
+	default:
+		ctx.ServerError(name, err)
+	}
+}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 0d6aa5531b..5f2237dd89 100755
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -708,6 +708,13 @@ func RegisterRoutes(m *macaron.Macaron) {
 	}, reqSignIn)
 	// ***** END: Organization *****
 
+	m.Group("/course", func() {
+		m.Get("/create", repo.CreateCourse)
+		m.Post("/create", bindIgnErr(auth.CreateCourseForm{}), repo.CreateCoursePost)
+		m.Get("/addOrg", repo.AddCourseOrg)
+
+	}, reqSignIn)
+
 	// ***** START: Repository *****
 	m.Group("/repo", func() {
 		m.Get("/create", repo.Create)
diff --git a/services/repository/repository.go b/services/repository/repository.go
index dffa1ba11b..86ee9370ef 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -5,12 +5,17 @@
 package repository
 
 import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strings"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/notification"
 	repo_module "code.gitea.io/gitea/modules/repository"
+	"code.gitea.io/gitea/modules/setting"
 	pull_service "code.gitea.io/gitea/services/pull"
-	"fmt"
 )
 
 // CreateRepository creates a repository for the user/organization.
@@ -86,3 +91,79 @@ func PushCreateRepo(authUser, owner *models.User, repoName string) (*models.Repo
 
 	return repo, nil
 }
+
+func GetRecommendCourseKeyWords() ([]string, error) {
+
+	url := setting.RecommentRepoAddr + "course_keywords"
+	result, err := RecommendFromPromote(url)
+
+	if err != nil {
+		return []string{}, err
+	}
+	return result, err
+
+}
+
+func GetRecommendRepoFromPromote(filename string) ([]map[string]interface{}, error) {
+	resultRepo := make([]map[string]interface{}, 0)
+	url := setting.RecommentRepoAddr + filename
+	result, err := RecommendFromPromote(url)
+
+	if err != nil {
+
+		return resultRepo, err
+	}
+
+	//resultRepo := make([]*models.Repository, 0)
+	for _, repoName := range result {
+		tmpIndex := strings.Index(repoName, "/")
+		if tmpIndex == -1 {
+			log.Info("error repo name format.")
+		} else {
+			ownerName := strings.Trim(repoName[0:tmpIndex], " ")
+			repoName := strings.Trim(repoName[tmpIndex+1:], " ")
+			repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
+			if err == nil {
+				repoMap := make(map[string]interface{})
+				repoMap["ID"] = fmt.Sprint(repo.ID)
+				repoMap["Name"] = repo.Name
+				repoMap["Alias"] = repo.Alias
+				repoMap["Creator"] = repo.Creator
+				repoMap["OwnerName"] = repo.OwnerName
+				repoMap["NumStars"] = repo.NumStars
+				repoMap["NumForks"] = repo.NumForks
+				repoMap["Description"] = repo.Description
+				repoMap["NumWatchs"] = repo.NumWatches
+				repoMap["Topics"] = repo.Topics
+				repoMap["Avatar"] = repo.RelAvatarLink()
+				resultRepo = append(resultRepo, repoMap)
+			} else {
+				log.Info("query repo error," + err.Error())
+			}
+		}
+	}
+	return resultRepo, nil
+}
+
+func RecommendFromPromote(url string) ([]string, error) {
+	resp, err := http.Get(url)
+	if err != nil || resp.StatusCode != 200 {
+		log.Info("Get organizations url error=" + err.Error())
+		return nil, err
+	}
+	bytes, err := ioutil.ReadAll(resp.Body)
+	resp.Body.Close()
+	if err != nil {
+		log.Info("Get organizations url error=" + err.Error())
+		return nil, err
+	}
+
+	allLineStr := string(bytes)
+	lines := strings.Split(allLineStr, "\n")
+	result := make([]string, len(lines))
+	for i, line := range lines {
+		log.Info("i=" + fmt.Sprint(i) + " line=" + line)
+		result[i] = strings.Trim(line, " ")
+	}
+	return result, nil
+}
-- 
2.34.1


From 110fb5cbc0b5b65608613ba7c2f40882d74a6cb0 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 14 Jan 2022 17:16:44 +0800
Subject: [PATCH 02/63] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/setting/setting.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index e7ab0b7d26..3d2bd91c58 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -568,6 +568,11 @@ var (
 	}{}
 
 	Warn_Notify_Mails []string
+
+	Course = struct {
+		OrgName  string
+		TeamName string
+	}{}
 )
 
 // DateLang transforms standard language locale name to corresponding value in datetime plugin.
@@ -1331,6 +1336,10 @@ func NewContext() {
 
 	sec = Cfg.Section("warn_mail")
 	Warn_Notify_Mails = strings.Split(sec.Key("mails").MustString(""), ",")
+
+	sec = Cfg.Section("course")
+	Course.OrgName = sec.Key("org_name").MustString("")
+	Course.TeamName = sec.Key("team_name").MustString("")
 }
 
 func SetRadarMapConfig() {
-- 
2.34.1


From 05eb0a31a91cd62269496cc5e4858627df012b76 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 17 Jan 2022 15:25:13 +0800
Subject: [PATCH 03/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/repo.go                    | 13 +++++++++++++
 services/repository/repository.go |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/models/repo.go b/models/repo.go
index 93e2cb140e..964bf7c363 100755
--- a/models/repo.go
+++ b/models/repo.go
@@ -572,6 +572,19 @@ func (repo *Repository) GetOwner() error {
 	return repo.getOwner(x)
 }
 
+func (repo *Repository) getCreator(e Engine) (err error) {
+	if repo.CreatorID == 0 {
+		return nil
+	}
+
+	repo.Creator, err = getUserByID(e, repo.CreatorID)
+	return err
+}
+
+func (repo *Repository) GetCreator() error {
+	return repo.getCreator(x)
+}
+
 func (repo *Repository) mustOwner(e Engine) *User {
 	if err := repo.getOwner(e); err != nil {
 		return &User{
diff --git a/services/repository/repository.go b/services/repository/repository.go
index 86ee9370ef..f43a3c62df 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -128,7 +128,12 @@ func GetRecommendRepoFromPromote(filename string) ([]map[string]interface{}, err
 				repoMap["ID"] = fmt.Sprint(repo.ID)
 				repoMap["Name"] = repo.Name
 				repoMap["Alias"] = repo.Alias
-				repoMap["Creator"] = repo.Creator
+				if repo.RepoType == models.RepoCourse {
+					//Load creator
+					repo.GetCreator()
+					repoMap["Creator"] = repo.Creator
+				}
+
 				repoMap["OwnerName"] = repo.OwnerName
 				repoMap["NumStars"] = repo.NumStars
 				repoMap["NumForks"] = repo.NumForks
-- 
2.34.1


From 6f8ad46c12fc274d0ba5afe60259caca1774cee0 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 17 Jan 2022 16:30:51 +0800
Subject: [PATCH 04/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/course.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/repo/course.go b/routers/repo/course.go
index b8f39817b0..013ee20da0 100644
--- a/routers/repo/course.go
+++ b/routers/repo/course.go
@@ -19,8 +19,9 @@ const (
 
 func CreateCourse(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("new_course")
+	org, _ := models.GetUserByName(setting.Course.OrgName)
 
-	ctx.Data["Owner"] = setting.Course.OrgName
+	ctx.Data["Owner"] = org
 
 	ctx.HTML(200, tplCreateCourse)
 
-- 
2.34.1


From 3f2c50e27156d754be2429816606c23f61173782 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 17 Jan 2022 16:36:28 +0800
Subject: [PATCH 05/63] fix issue

---
 options/locale/locale_en-US.ini  |  2 +
 options/locale/locale_zh-CN.ini  |  3 +
 templates/repo/createCourse.tmpl | 98 ++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 templates/repo/createCourse.tmpl

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1756b9533d..17f639866f 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -348,6 +348,8 @@ modify = Update
 [form]
 UserName = Username
 Alias = Repository name
+courseAlias = Course Name
+courseAdress = Course Path
 RepoPath = Repository path
 RepoAdress = Repository Adress
 Email = Email address
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index d034b17220..93afc66c40 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -353,6 +353,8 @@ modify=更新
 UserName=用户名
 RepoName=项目路径
 Alias=项目名称
+courseAlias=课程名称
+courseAdress=课程地址
 RepoPath=项目路径
 RepoAdress=项目地址
 Email=邮箱地址
@@ -802,6 +804,7 @@ generate_from=生成自
 repo_desc=项目描述
 repo_lang=项目语言
 repo_gitignore_helper=选择 .gitignore 模板。
+repo_label_helpe=输入完成后回车键完成标签确定。
 issue_labels=任务标签
 issue_labels_helper=选择一个任务标签集
 license=授权许可
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
new file mode 100644
index 0000000000..5ce7d010b2
--- /dev/null
+++ b/templates/repo/createCourse.tmpl
@@ -0,0 +1,98 @@
+{{template "base/head" .}}
+<div class="repository new repo" style="margin-top: 40px;">
+	<div class="ui middle very relaxed page grid">
+		<div class="column">
+			<form class="ui form" action="{{.Link}}" method="post" id="create_repo_form">
+				{{.CsrfTokenHtml}}
+				<h3 class="ui top attached header">
+					{{.i18n.Tr "new_course"}}
+				</h3>
+				<div class="ui attached segment">
+					{{template "base/alert" .}}
+					<div class="inline required field" >
+                        <label for="Alias">{{.i18n.Tr "form.courseAlias"}}</label>
+                        <input id="alias" name="Alias" value="" autofocus required>
+                        <span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
+                    </div>
+                
+                    <div class="inline required fields" style="margin-bottom: 0;">
+                        <label style="text-align: right;width: 250px!important;word-wrap: break-word;">{{.i18n.Tr "form.courseAdress"}}</label>
+                        <div class="required field {{if .Err_Owner}}error{{end}}" style="padding: 0;">
+                            <div class="ui selection owner dropdown" id="ownerDropdown">
+                                <input type="hidden" id="uid" name="uid" value="{{.Owner.Name}}" required>
+                                <div class="text"  title="{{.Owner.Name}}">
+                                    <img class="ui mini image" src="{{.Owner.RelAvatarLink}}">
+                                    {{$.Owner.Name}}
+                                </div>
+                            </div>
+                        </div>
+                         <div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 0px;text-align: center;">/</div>
+                        <div class="required field {{if .Err_RepoName}}error{{end}}">
+                            <input style="width: 100% !important;" id="repo_name" name="RepoName" value="{{.repo_name}}" autofocus required>
+                        </div>
+                    </div>
+                    <span style="display: block;margin-bottom: 1em;" class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
+                    <div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
+                        <label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
+                        <span></span>
+                    </div>
+
+                    <div class="inline required field">
+                        <label>{{.i18n.Tr "repo.model.manage.label"}}</label>
+                        <div class="ui multiple search selection dropdown">
+                            <input type="hidden" name="Topics" value="">
+                            <div class="default text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
+                            <div class="menu" id="course_label_item">
+                            </div>
+                        </div>
+                    </div>
+
+					<div class="inline field {{if .Err_Description}}error{{end}}">
+						<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
+						<textarea id="description" name="Description" maxlength="254">{{.description}}</textarea>
+					</div>
+					<div class="inline field">
+						<label></label>
+						<button class="ui green button" id="submit_reponame">
+							{{.i18n.Tr "new_course"}}
+						</button>
+						<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
+
+<script>
+
+$(document).ready(function(){
+    $('.ui.multiple.search.selection.dropdown')
+    .dropdown({
+        allowAdditions: true,
+        onChange: function(value, text, $selectedItem) {
+            $('#course_label_item').empty()
+        }
+    })
+    $('input.search').bind('input propertychange', function (event) {
+        const query  = $('input.search').val()
+        if(!query){
+            $('#course_label_item').empty()
+        }else{
+            $.get(`/api/v1/topics/search?q=${query}`,(data)=>{
+                console.log(data)
+                if(data.topics.length!==0){
+                    let html=''
+                    $('#course_label_item').empty()
+                    data.topics.forEach(element => {
+                        html += `<div class="item" data-value="${element.topic_name}">${element.topic_name}</div>`
+                    });
+                    $('#course_label_item').append(html)
+                }
+            })
+        }
+    });
+})
+
+</script>
\ No newline at end of file
-- 
2.34.1


From e3d6399311dfb712619ef0aad251143e439e21c7 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 17 Jan 2022 16:58:10 +0800
Subject: [PATCH 06/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=83=E6=A0=A1?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_zh-CN.ini          |   4 +
 templates/org/course_list.tmpl           | 334 ++++++++++++++++
 templates/org/home_courses.tmpl          | 479 +++++++++++++++++++++++
 templates/org/member/course_members.tmpl |   0
 templates/org/team/courseTeams.tmpl      |   0
 5 files changed, 817 insertions(+)
 create mode 100644 templates/org/course_list.tmpl
 create mode 100644 templates/org/home_courses.tmpl
 create mode 100644 templates/org/member/course_members.tmpl
 create mode 100644 templates/org/team/courseTeams.tmpl

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index d034b17220..5180eadaab 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2050,6 +2050,7 @@ team_access_desc=项目权限
 team_permission_desc=权限
 team_unit_desc=允许访问项目单元
 team_unit_disabled=(已禁用)
+selected_couse=精选课程
 
 form.name_reserved=组织名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=组织名称中不允许使用 "%s"。
@@ -2136,6 +2137,9 @@ teams.all_repositories_read_permission_desc=此团队授予<strong>读取</stron
 teams.all_repositories_write_permission_desc=此团队授予<strong>修改</strong><strong>所有项目</strong>的访问权限: 成员可以查看和推送至项目。
 teams.all_repositories_admin_permission_desc=该团队拥有 <strong>管理</strong> <strong>所有项目</strong>的权限：团队成员可以读取、克隆、推送以及添加其它项目协作者。
 
+teams.join_teams=加入该组织
+
+
 [admin]
 dashboard=管理面板
 users=帐户管理
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
new file mode 100644
index 0000000000..a371ec4ffe
--- /dev/null
+++ b/templates/org/course_list.tmpl
@@ -0,0 +1,334 @@
+<style>
+    .text-right{
+        float:right !important;
+    }
+    .header{
+        font-weight:bold;
+        font-size: 18px;
+        font-family: SourceHanSansSC-medium;
+    }
+    .cor{
+		color:#0366D6 !important;
+	}
+    .header_card{
+        /* color:#003A8C !important; */
+        color:#101010 !important;
+        margin: 10px 0 0px 0;
+        height: 25px;
+        font-size: 18px;
+    }
+    .marg{
+        margin: 0 5px !important;
+    }
+
+    .content_list{
+        max-height: 130px;
+        overflow: auto;
+    }
+    .Relist{
+        color:#0366D6 !important;
+	} 
+    .descript_height{
+        color: #101010 !important;
+        margin: 10px 0;
+        height: 40px !important;
+        word-break:break-all;
+        line-height: 20px; 
+        overflow: hidden;
+        /* overflow: hidden!important;
+        word-wrap:break-word!important; */
+
+
+    }
+
+    .tags_height{
+        height: 30px !important;
+    }
+    .full_height{
+        height: 100%;
+    }
+    .omit{
+        overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
+    }
+    /deep/ ui.checkbox input[type=checkbox]::after{
+        border: 1px solid #0366D6 !important;
+    }
+    .nowrap-2 {
+        /* height: 2.837em; */
+        /* line-height: 1.4285em; */
+        overflow: hidden;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+    }
+    .ui.label{
+        color:#0366D6 !important;
+        background-color: #B3DBDB !important;
+        font-weight:normal !important
+    }
+
+
+</style>
+<div class="ui stackable grid">
+    <!-- <div style="width: 100%;margin:15px 0;">
+        {{if .tags}} 
+            <span class="header">
+                精选项目      
+            </span>
+            {{if .IsOrganizationOwner}}        
+                <a class="text-right" id="model" onclick="showcreate()" >{{svg "octicon-gear" 16}}自定义</a>
+            {{end}}
+        {{end}}
+        
+    </div> -->
+
+    <div style="width: 100%;">
+  
+        <div class="ui three cards" style="margin-bottom: 10px;">
+            {{range .Repos}}
+                <div class="card" >
+                
+                    <div class="extra full_height cor"  >
+                        <div class="content " >
+                            {{if .Topics }} 
+                                <div class="  tags "  style="position: relative;">
+                                    {{range .Topics}}
+                                            {{if ne . "" }}<a  style="max-width:100%;margin: 5px 0;display:inline-flex;" href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}" ><span class="ui small label topic omit"  >{{.}}</span></a>{{end}}
+                                    {{end}}
+                                    
+                                </div>
+                            {{end}}  
+                            
+                        </div> 
+
+                        <div class=" header header_card omit" >
+                            <a class="header_card image poping up "   href="{{.Link}}" data-content="{{.Alias}}" data-position="top left" data-variation="tiny inverted">  {{.Alias}}</a>
+                        </div>
+                        
+                        <div class='content descript_height nowrap-2'>
+                            {{.Description}}
+                            <!-- <p class="time">
+                                {{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}
+                                {{if .PrimaryLanguage }}
+                                <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
+                                {{end}}
+                            </p> -->
+                        </div>
+                        
+                        
+                                                        
+                        
+                    </div>
+                    <div class=" extra " style="color:#888888;border-top: none !important">
+                        <p class="time">
+                            {{$.i18n.Tr "org.repo_updated"}}{{.CreatedUnix.FormatShort}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}
+                            <!-- {{if .PrimaryLanguage }}
+                            <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
+                            {{end}} -->
+                        </p>
+                        <!-- <div class="ui mini right compact marg" >
+                            <a class="item marg ">
+                                {{svg "octicon-eye" 16}} {{.NumWatches}}
+                            </a>
+                            <a class="item marg">
+                                {{svg "octicon-star" 16}} {{.NumStars}}
+                            </a>
+                            <a class="item marg">
+                                {{svg "octicon-git-branch" 16}} {{.NumForks}}
+                            </a>
+                            
+                        </div> -->
+                    </div>
+                </div>   
+            {{end}}
+        </div>
+                    
+    </div>
+
+</div>
+
+<!-- <div class="ui modal">
+    <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
+        <h4 id="model_header">自定义精选课程</h4>
+    </div>
+    <div class="content content-padding" style="color: black;">
+        <p>最多可选9个公开项目</p>
+        <div class="ui search" >
+            <div class="ui input" style="width: 100%;">
+                <input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
+            </div>
+        </div>
+        <div style="margin: 10px ;">
+            <div id ='org_list' style="margin-bottom: 20px;"class="content_list" >
+
+            </div>     
+        </div>
+        <p id='recommend'></p>
+       
+        <div class="inline field" style="margin-left: 37%;">
+            <div class="actions">
+                <button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
+                    {{.i18n.Tr "explore.save"}}
+                </button>
+                <button class="ui button cancel" >{{.i18n.Tr "explore.cancel"}}</button>
+            </div>
+        </div> 
+         
+    </div>
+
+</div> -->
+
+<script>
+    var data;
+    var filterData=[];
+    var num=0;
+
+    function showcreate(obj){
+        document.getElementById("search_selectPro").value=''
+        $('.ui.modal')
+        .modal({
+            centered: false,
+            onShow:function(){
+                $("#org_list").empty()                
+                getPro(1)
+                
+            },
+            onHide:function(){
+  
+            }
+        })
+        .modal('show')
+    }
+    function getPro(typeTag){
+
+        $.ajax({
+            type:"GET",
+            url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
+            dataType:"json",
+            async:false,
+            success:function(json){
+                data = json.data;
+                var n_length = data.length
+                pro_html = getHTML(data)
+                $("#org_list").append(pro_html)
+                // console.log('原始',data)
+                checkedNum(0)
+            }
+        });
+    }
+    function getHTML(data){
+        let pro_html=''
+        for (let i=0;i<data.length;i++){
+            if (data[i].Selected==true){
+                console.log("data[i]:",data[i])
+                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = " ${i}" checked="" onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}"  data-selected=${data[i].Selected} > <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName}</label></div>`
+                pro_html += '</div>'
+            }
+            else{
+                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = "${i}"  onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}" data-selected= ${data[i].Selected}> <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName} </label></div>`
+                pro_html += '</div>'
+            }
+        }
+        return pro_html
+    }
+    function saveSeletedPro(typeTag){
+        var saveData=[];
+        $('input[name="select_pro_name"]:checked').each(function(){
+            console.log('值',this.dataset.repoid)
+
+            saveData.push(parseInt(this.dataset.repoid));
+        })
+        if(saveData.length>9){
+            alert("最多可选9个，保存失败")
+            return
+        }
+        // saveData = getSelecteDataID();
+        // console.log("数据：",saveData)
+        $.ajax({
+         type:"POST",
+         url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
+         contentType:'application/json',
+         dataType:"json",
+         async:false,
+         data:JSON.stringify({'repoList':saveData
+               }),        
+           success:function(res){
+             console.log('保存成功');
+             location.reload()  
+
+          }
+         });
+    }
+
+    function getSelecteData(){
+        var selectedData=[];
+        $('input[name="select_pro_name"]:checked').each(function(){
+            // console.log(this)
+            // console.log('值',this.dataset.selected)
+
+            selectedData.push({"RepoID":parseInt(this.dataset.repoid),"RepoName":this.dataset.reponame,"Selected":JSON.parse(this.dataset.selected)});
+        })
+        return selectedData
+    }
+    function search(){
+        var selectedData = getSelecteData();
+        var searchValue = document.getElementById("search_selectPro").value;
+        filterData=[];
+        console.log("searchValue:",searchValue)
+        for (let i=0;i<data.length;i++){
+            var isInclude=false; 
+            if(data[i].RepoName.toLowerCase().includes(searchValue.toLowerCase())){
+                filterData.push(data[i])
+            }
+        }
+        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)
+        $("#org_list").empty()
+        if(searchValue!=""){
+            if (filterData.length!=0){
+                
+                var pro_html = getHTML(selectedData);
+                console.log("selectedData_pro_html:",pro_html)
+                $("#org_list").append(pro_html)
+                pro_html= getHTML(filterData);
+                $("#org_list").append(pro_html)
+            }else{
+                var pro_html = getHTML(selectedData);
+                $("#org_list").append(pro_html)
+            }
+        }else{
+            var pro_html = getHTML(data);
+            $("#org_list").append(pro_html)
+        }
+    }
+
+    function checkedNum(id){
+
+        num=0;
+        var inputs = document.getElementsByName("select_pro_name")
+        for (var i=0;i<inputs.length;i++){
+            if(inputs[i].checked){
+                num++
+                if(num>9){
+                    document.getElementById(id).checked=false
+                    alert("选择超过9个，请重新选择！")
+                    return
+                }
+            }
+                
+        }
+
+        var show_num = 9-num;
+        document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
+
+    }
+
+</script>
\ No newline at end of file
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
new file mode 100644
index 0000000000..0f9b70f673
--- /dev/null
+++ b/templates/org/home_courses.tmpl
@@ -0,0 +1,479 @@
+<style>
+	.organization-info_1000{
+		background: #F5F5F6 !important;
+
+	}
+	.organization-info >.container {
+		overflow: auto;
+		background: #f5f5f6 !important;
+		padding-top: 30px;
+		padding-bottom: 20px;
+		background-size: cover;
+		border-radius: 5px;
+		border: none !important
+	}
+
+	.organization.profile #org-avatar {
+		border:none !important
+	}
+	.desc {
+		font-size: 14px;
+		margin-bottom: 10px !important;
+    }
+	.item {
+		display: inline-block;
+		margin-right: 10px;
+    }
+	.item .icon {
+      	margin-right: 5px;
+    }
+	.organization-info >.container {
+		padding-bottom:0px !important;
+	}
+	.tag_bg{
+		background-color: #0366D6 !important;
+		color:#FFFFFF !important;
+	}
+	.course{
+		padding: 10px 15px !important;
+	}
+	.course_color{
+		color: #FA8C16;
+	}
+	.tag_lable{
+		border: 1px solid rgba(232, 232, 232, 100) ;
+		border-radius: 4px;
+		color: rgba(65, 80, 88, 100);
+		font-family: Microsoft Yahei;
+		font-size: 14px;
+		padding: 0.3em 0.5em;
+		height: 30px;
+		text-align: center;
+		margin: 0.2em;
+	}
+	.tag_lable_first{
+		border: 1px solid rgba(232, 232, 232, 100) ;
+		border-radius: 4px;
+		color: rgba(65, 80, 88, 100);
+		font-family: Microsoft Yahei;
+		font-size: 14px;
+		padding: 0.3em 0.5em;
+		height: 30px;
+		text-align: center;
+		margin: 0.2em;
+		margin-left: none;
+	}
+
+</style>
+{{template "base/head" .}}
+<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">
+			<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
+			<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}}
+				</div>
+				
+				<div class="meta" style="display: inline-flex;">
+					{{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 class="ui tabs container">
+			<div class="ui tabular stackable menu navbar">
+				{{with .Org}}
+					<a class="{{if $.PageIsOrgHome}}active{{end}} item " href="{{.HomeLink}}">
+						{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
+					</a>
+				{{end}}
+				<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+					{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+				</a>
+				{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
+					<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
+						{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
+					</a>
+				{{end}}
+				{{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
+			</div>
+
+		</div>
+
+	</div>
+		<!-- <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> -->
+
+	<div class="ui container">
+
+		<!-- 新增 -->
+		<div class="ui stackable grid">	
+		
+			<div class="ui sixteen wide computer column">
+				<div class="ui mobile reversed stackable grid">
+					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
+						<a class="ui small lable tag_lable topic tag_bg" style="margin-left: 0px;" >全部关键字</a>
+                        {{range .CoursesKeywords}}
+                            <a class="ui small lable tag_lable topic" >{{.}}</a>
+                        {{end}}
+					</div>
+				
+					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
+						<!-- {{if .CanCreateOrgRepo}} -->
+							<div class="text center" style="margin-left: 10px;">
+								<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程{{.i18n.Tr "new_repo"}} </a>
+							</div>
+						<!-- {{end}} -->
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<!-- 全部 -->
+
+		<div class="ui stackable grid">	
+		
+			<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>
+
+					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
+
+						<h4 class="ui top attached header">
+							<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
+							<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">
+							{{range $i, $v := .RecommendCourses}}
+			
+								{{if gt $i 0}}
+									<div class="ui divider" style="margin-bottom:10px;"></div>
+								{{end}}
+								<div class="item">
+									<i class="ri-bookmark-3-line course_color" ></i>
+									<div class="content"  style="margin-left: 10px;">
+										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
+										<p class="text grey">
+											贡献者：{{.Creator.Name}}
+										</p>
+									</div>
+								</div>
+								<!-- <div class="ui divider"></div> -->
+							{{end}}
+							
+						
+						</div>
+
+						
+						<h4 class="ui top attached header">
+							<strong>{{.i18n.Tr "org.people"}}</strong>
+							<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">
+							{{$isMember := .IsOrganizationMember}}
+							{{range .Members}}
+								{{if or $isMember (.IsPublicMember $.Org.ID)}}
+									<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.RelAvatarLink}}"></a>
+								{{end}}
+							{{end}}
+
+                            <div style="text-align: center;margin-top: 5px;"> 
+                                <a class="ui blue basic button" href="{{.OrgLink}}/teams/new"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+                            </div>
+						</div>
+
+						{{if .IsOrganizationMember}}
+							<div class="ui top attached header">
+								<strong>{{.i18n.Tr "org.teams"}}</strong>
+								<div class="ui right">
+									<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
+								</div>
+							</div>
+							<div class="ui attached table segment teams">
+								{{range .Teams}}
+									<div class="item">
+										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
+										<p class="text grey">
+											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
+											<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
+										</p>
+									</div>
+								{{end}}
+							</div>
+							{{if .IsOrganizationOwner}}
+								<div class="ui bottom attached segment">
+									<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+								</div>
+							{{end}}
+						{{end}}
+					</div>
+				</div>
+			</div>
+			
+		</div>
+	</div>
+</div>
+
+<div class="ui modal">
+    <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
+        <h4 id="model_header">自定义精选课程</h4>
+    </div>
+    <div class="content content-padding" style="color: black;">
+        <p>最多可选9个公开项目</p>
+        <div class="ui search" >
+            <div class="ui input" style="width: 100%;">
+                <input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
+            </div>
+        </div>
+        <div style="margin: 10px ;">
+            <div id ='org_list' style="margin-bottom: 20px;"class="content_list" >
+
+            </div>     
+        </div>
+        <p id='recommend'></p>
+       
+        <div class="inline field" style="margin-left: 37%;">
+            <div class="actions">
+                <button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
+                    {{.i18n.Tr "explore.save"}}
+                </button>
+                <button class="ui button cancel" >{{.i18n.Tr "explore.cancel"}}</button>
+            </div>
+        </div> 
+         
+    </div>
+
+</div>
+
+{{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 ()
+	{
+		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].className = "ui small lable tag_lable topic";
+						this.className = "ui small lable tag_lable topic tag_bg";
+				};
+		}
+	};
+
+    var data;
+    var filterData=[];
+    var num=0;
+
+    function showcreate(obj){
+        document.getElementById("search_selectPro").value=''
+        $('.ui.modal')
+        .modal({
+            centered: false,
+            onShow:function(){
+                $("#org_list").empty()                
+                getPro(1)
+                
+            },
+            onHide:function(){
+  
+            }
+        })
+        .modal('show')
+    }
+    function getPro(typeTag){
+
+        $.ajax({
+            type:"GET",
+            url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
+            dataType:"json",
+            async:false,
+            success:function(json){
+                data = json.data;
+                var n_length = data.length
+                pro_html = getHTML(data)
+                $("#org_list").append(pro_html)
+                // console.log('原始',data)
+                checkedNum(0)
+            }
+        });
+    }
+    function getHTML(data){
+        let pro_html=''
+        for (let i=0;i<data.length;i++){
+            if (data[i].Selected==true){
+                console.log("data[i]:",data[i])
+                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = " ${i}" checked="" onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}"  data-selected=${data[i].Selected} > <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName}</label></div>`
+                pro_html += '</div>'
+            }
+            else{
+                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = "${i}"  onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}" data-selected= ${data[i].Selected}> <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName} </label></div>`
+                pro_html += '</div>'
+            }
+        }
+        return pro_html
+    }
+    function saveSeletedPro(typeTag){
+        var saveData=[];
+        $('input[name="select_pro_name"]:checked').each(function(){
+            console.log('值',this.dataset.repoid)
+
+            saveData.push(parseInt(this.dataset.repoid));
+        })
+        if(saveData.length>9){
+            alert("最多可选9个，保存失败")
+            return
+        }
+        // saveData = getSelecteDataID();
+        // console.log("数据：",saveData)
+        $.ajax({
+         type:"POST",
+         url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
+         contentType:'application/json',
+         dataType:"json",
+         async:false,
+         data:JSON.stringify({'repoList':saveData
+               }),        
+           success:function(res){
+             console.log('保存成功');
+             location.reload()  
+
+          }
+         });
+    }
+
+    function getSelecteData(){
+        var selectedData=[];
+        $('input[name="select_pro_name"]:checked').each(function(){
+            // console.log(this)
+            // console.log('值',this.dataset.selected)
+
+            selectedData.push({"RepoID":parseInt(this.dataset.repoid),"RepoName":this.dataset.reponame,"Selected":JSON.parse(this.dataset.selected)});
+        })
+        return selectedData
+    }
+    function search(){
+        var selectedData = getSelecteData();
+        var searchValue = document.getElementById("search_selectPro").value;
+        filterData=[];
+        console.log("searchValue:",searchValue)
+        for (let i=0;i<data.length;i++){
+            var isInclude=false; 
+            if(data[i].RepoName.toLowerCase().includes(searchValue.toLowerCase())){
+                filterData.push(data[i])
+            }
+        }
+        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)
+        $("#org_list").empty()
+        if(searchValue!=""){
+            if (filterData.length!=0){
+                
+                var pro_html = getHTML(selectedData);
+                console.log("selectedData_pro_html:",pro_html)
+                $("#org_list").append(pro_html)
+                pro_html= getHTML(filterData);
+                $("#org_list").append(pro_html)
+            }else{
+                var pro_html = getHTML(selectedData);
+                $("#org_list").append(pro_html)
+            }
+        }else{
+            var pro_html = getHTML(data);
+            $("#org_list").append(pro_html)
+        }
+    }
+
+    function checkedNum(id){
+
+        num=0;
+        var inputs = document.getElementsByName("select_pro_name")
+        for (var i=0;i<inputs.length;i++){
+            if(inputs[i].checked){
+                num++
+                if(num>9){
+                    document.getElementById(id).checked=false
+                    alert("选择超过9个，请重新选择！")
+                    return
+                }
+            }
+                
+        }
+
+        var show_num = 9-num;
+        document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
+
+    }
+
+</script>
\ No newline at end of file
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.34.1


From c7ae3915aeea63c50b55c95d81099b38695c0636 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 17 Jan 2022 17:00:50 +0800
Subject: [PATCH 07/63] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/home.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routers/org/home.go b/routers/org/home.go
index 4c350d352f..b6fda5332d 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -92,8 +92,6 @@ func Home(ctx *context.Context) {
 	if setting.Course.OrgName == org.Name {
 		pageSize = 15
 		CourseOptional = util.OptionalBoolTrue
-		recommendCourses, _ := repository.GetRecommendRepoFromPromote("courses")
-		ctx.Data["RecommendCourses"] = recommendCourses
 		recommendCourseKeyWords, _ := repository.GetRecommendCourseKeyWords()
 		ctx.Data["CoursesKeywords"] = recommendCourseKeyWords
 
-- 
2.34.1


From 4ae27f6cfa14b4db383bbc9c94f4ee05de712087 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 17 Jan 2022 17:09:20 +0800
Subject: [PATCH 08/63] fix issue

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

diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 0f9b70f673..e48a3db2c8 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -157,7 +157,7 @@
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 						<!-- {{if .CanCreateOrgRepo}} -->
 							<div class="text center" style="margin-left: 10px;">
-								<a class="ui green button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程{{.i18n.Tr "new_repo"}} </a>
+								<a class="ui green button" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程{{.i18n.Tr "new_repo"}} </a>
 							</div>
 						<!-- {{end}} -->
 					</div>
-- 
2.34.1


From 1ec4576ac83923496f205a3abd6dfc309d9d2c9a Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 17 Jan 2022 17:45:01 +0800
Subject: [PATCH 09/63] fix issue

---
 options/locale/locale_en-US.ini  | 1 +
 templates/repo/createCourse.tmpl | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 9eb99cb692..d1dac2d3a2 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -798,6 +798,7 @@ generate_from = Generate From
 repo_desc = Description
 repo_lang = Language
 repo_gitignore_helper = Select .gitignore templates.
+repo_label_helpe = After the input is completed, press the Enter key to complete the label determination.
 issue_labels = Issue Labels
 issue_labels_helper = Select an issue label set.
 license = License
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 5ce7d010b2..d2a77eea9a 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -11,7 +11,7 @@
 					{{template "base/alert" .}}
 					<div class="inline required field" >
                         <label for="Alias">{{.i18n.Tr "form.courseAlias"}}</label>
-                        <input id="alias" name="Alias" value="" autofocus required>
+                        <input id="alias" name="alias" value="" autofocus required>
                         <span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
                     </div>
                 
@@ -28,7 +28,7 @@
                         </div>
                          <div class="ui interval" style="width: 0.6em;font-size: 2rem;line-height: 0px;text-align: center;">/</div>
                         <div class="required field {{if .Err_RepoName}}error{{end}}">
-                            <input style="width: 100% !important;" id="repo_name" name="RepoName" value="{{.repo_name}}" autofocus required>
+                            <input style="width: 100% !important;" id="repo_name" name="repo_name" value="{{.repo_name}}" autofocus required>
                         </div>
                     </div>
                     <span style="display: block;margin-bottom: 1em;" class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
@@ -40,7 +40,7 @@
                     <div class="inline required field">
                         <label>{{.i18n.Tr "repo.model.manage.label"}}</label>
                         <div class="ui multiple search selection dropdown">
-                            <input type="hidden" name="Topics" value="">
+                            <input type="hidden" name="topics" value="">
                             <div class="default text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
                             <div class="menu" id="course_label_item">
                             </div>
@@ -49,7 +49,7 @@
 
 					<div class="inline field {{if .Err_Description}}error{{end}}">
 						<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
-						<textarea id="description" name="Description" maxlength="254">{{.description}}</textarea>
+						<textarea id="description" name="description" maxlength="254">{{.description}}</textarea>
 					</div>
 					<div class="inline field">
 						<label></label>
-- 
2.34.1


From aba794d0c38b7449e7a8c3fd1f5c4abc4d33c0eb Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 17 Jan 2022 17:49:45 +0800
Subject: [PATCH 10/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B2=BE=E5=93=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B4=A1=E7=8C=AE=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/home.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/routers/org/home.go b/routers/org/home.go
index b6fda5332d..aaafec9d86 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -154,6 +154,16 @@ func Home(ctx *context.Context) {
 
 	//find org tag info
 	tags, err := models.GetAllOfficialTagRepos(org.ID, ctx.Org.IsOwner)
+
+	if setting.Course.OrgName == org.Name {
+		for _, tag := range tags {
+			for _, repo := range tag.RepoList {
+				repo.GetCreator()
+			}
+		}
+
+	}
+
 	if err != nil {
 		ctx.ServerError("GetAllOfficialTagRepos", err)
 		return
-- 
2.34.1


From 984425d748f1f0afab693fe082190447437549bd Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 18 Jan 2022 08:44:13 +0800
Subject: [PATCH 11/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/home.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/org/home.go b/routers/org/home.go
index aaafec9d86..b2c79a54f3 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -158,7 +158,7 @@ func Home(ctx *context.Context) {
 	if setting.Course.OrgName == org.Name {
 		for _, tag := range tags {
 			for _, repo := range tag.RepoList {
-				repo.GetCreator()
+				(&repo).GetCreator()
 			}
 		}
 
-- 
2.34.1


From eed2747b38f517c361ece55c64f08f4cf9877285 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 18 Jan 2022 08:49:29 +0800
Subject: [PATCH 12/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini |  2 ++
 templates/org/course_list.tmpl  |  6 ++--
 templates/org/home_courses.tmpl | 60 ++++++++++++++++++++++-----------
 templates/repo/view_list.tmpl   |  9 ++---
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index d1dac2d3a2..d289df75fe 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2041,6 +2041,7 @@ team_access_desc = Repository access
 team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
+selected_couse=Selected course
 
 form.name_reserved = The organization name '%s' is reserved.
 form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
@@ -2126,6 +2127,7 @@ teams.all_repositories_helper = Team has access to all repositories. Selecting t
 teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
 teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
 teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
+teams.join_teams=Join the organization
 
 [admin]
 dashboard = Dashboard
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index a371ec4ffe..ab0076783a 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -121,8 +121,10 @@
                         
                     </div>
                     <div class=" extra " style="color:#888888;border-top: none !important">
-                        <p class="time">
-                            {{$.i18n.Tr "org.repo_updated"}}{{.CreatedUnix.FormatShort}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}
+                        <p class="time" style="font-size: 14px;">
+                            {{.RelAvatarLink}}
+                            <img class="ui avatar" src="{{.RelAvatarLink}}">
+                            {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
                             <!-- {{if .PrimaryLanguage }}
                             <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
                             {{end}} -->
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index e48a3db2c8..4c7ac7285c 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -194,23 +194,27 @@
 						</h4>
                
 						<div class="ui attached table segment course items">
-							{{range $i, $v := .RecommendCourses}}
-			
-								{{if gt $i 0}}
-									<div class="ui divider" style="margin-bottom:10px;"></div>
-								{{end}}
-								<div class="item">
-									<i class="ri-bookmark-3-line course_color" ></i>
-									<div class="content"  style="margin-left: 10px;">
-										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
-										<p class="text grey">
-											贡献者：{{.Creator.Name}}
-										</p>
-									</div>
-								</div>
-								<!-- <div class="ui divider"></div> -->
-							{{end}}
-							
+                            {{ range .tags}}
+                                {{if eq .TagName "精选项目"}}
+                                    {{.RepoList}}
+                                    {{range $i, $v := .RepoList}}
+                                        {{if gt $i 0}}
+                                            <div class="ui divider" style="margin-bottom:10px;"></div>
+                                        {{end}}
+                                        <div class="item">
+                                            <i class="ri-bookmark-3-line course_color" ></i>
+                                            <div class="content"  style="margin-left: 10px;">
+                                                <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
+                                                <p class="text grey">
+                                                    {{.Creator}}
+                                                    贡献者：{{.Creator}}
+                                                </p>
+                                            </div>
+                                        </div>
+
+                                    {{end}}
+                                {{end}}
+                            {{end}}
 						
 						</div>
 
@@ -233,7 +237,7 @@
 							{{end}}
 
                             <div style="text-align: center;margin-top: 5px;"> 
-                                <a class="ui blue basic button" href="{{.OrgLink}}/teams/new"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+                                <a class="ui blue basic button" onclick="jion_course_team()"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
                             </div>
 						</div>
 
@@ -465,6 +469,7 @@
                 if(num>9){
                     document.getElementById(id).checked=false
                     alert("选择超过9个，请重新选择！")
+                    
                     return
                 }
             }
@@ -475,5 +480,22 @@
         document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
 
     }
-
+    function jion_course_team(){
+        $.ajax({
+            type:"GET",
+            url:"/course/addOrg",
+            dataType:"json",
+            async:false,
+            success:function(json){
+                data = json;
+                if(data.code==0){
+                    alert("加入成功")
+                    location.reload()  
+
+                }else{
+                    alert("加入失败")
+                } 
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 3640ff1330..456ec1365c 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -73,7 +73,7 @@
 						</span>
 					</td>
 				{{else}}
-					<td class="name four wide">
+					<td class="name thirteen wide">
 						<span class="truncate">
 							{{if $entry.IsDir}}
 								{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
@@ -93,12 +93,13 @@
 						</span>
 					</td>
 				{{end}}
-				<td class="message nine wide">
+				
+				<!-- <td class="message nine wide">
 					<span class="truncate">
 						<a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary | RenderEmoji}}</a>
 					</span>
-				</td>
-				<td class="text right age three wide">{{TimeSince $commit.Committer.When $.Lang}}</td>
+				</td> -->
+				<td class="text right age one wide" style="text-align: right;">{{TimeSince $commit.Committer.When $.Lang}}</td>
 			</tr>
 		{{end}}
 	</tbody>
-- 
2.34.1


From e9129ad52208f383549c4118c3b30afd22b83704 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 18 Jan 2022 09:30:17 +0800
Subject: [PATCH 13/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/course_list.tmpl           | 12 ++--
 templates/org/home_courses.tmpl          |  5 +-
 templates/org/member/course_members.tmpl | 76 ++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index ab0076783a..7cfbbbc672 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -29,7 +29,7 @@
         color:#0366D6 !important;
 	} 
     .descript_height{
-        color: #101010 !important;
+        color: #999999 !important;
         margin: 10px 0;
         height: 40px !important;
         word-break:break-all;
@@ -70,7 +70,7 @@
 
 
 </style>
-<div class="ui stackable grid">
+<!-- <div class="ui stackable grid"> -->
     <!-- <div style="width: 100%;margin:15px 0;">
         {{if .tags}} 
             <span class="header">
@@ -120,10 +120,10 @@
                                                         
                         
                     </div>
-                    <div class=" extra " style="color:#888888;border-top: none !important">
+                    <div class=" extra " style="color:#888888;border-top: none !important;padding-top: 0px;">
                         <p class="time" style="font-size: 14px;">
-                            {{.RelAvatarLink}}
-                            <img class="ui avatar" src="{{.RelAvatarLink}}">
+                            
+                            <!-- <img class="ui avatar" src="{{.RelAvatarLink}}"> -->
                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
                             <!-- {{if .PrimaryLanguage }}
                             <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
@@ -148,7 +148,7 @@
                     
     </div>
 
-</div>
+<!-- </div> -->
 
 <!-- <div class="ui modal">
     <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 4c7ac7285c..a5b1e0ca3e 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -196,7 +196,6 @@
 						<div class="ui attached table segment course items">
                             {{ range .tags}}
                                 {{if eq .TagName "精选项目"}}
-                                    {{.RepoList}}
                                     {{range $i, $v := .RepoList}}
                                         {{if gt $i 0}}
                                             <div class="ui divider" style="margin-bottom:10px;"></div>
@@ -206,8 +205,8 @@
                                             <div class="content"  style="margin-left: 10px;">
                                                 <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
-                                                    {{.Creator}}
-                                                    贡献者：{{.Creator}}
+                                                    
+                                                    贡献者：
                                                 </p>
                                             </div>
                                         </div>
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index e69de29bb2..87189c0157 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -0,0 +1,76 @@
+{{template "base/head" .}}
+<div class="organization members">
+	{{template "org/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}
+		{{template "org/navber" .}}
+		<div class="ui stackable grid">
+		
+			
+			<div class="ui sixteen wide computer column list">
+				{{ range .Members}}
+					<div class="item ui grid">
+						<div class="ui two wide column">
+							<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
+						</div><div class="ui three wide column">
+							<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
+							<div class="meta">{{.FullName}}</div>
+						</div><div class="ui four wide column center">
+							<div class="meta">
+								{{$.i18n.Tr "org.members.membership_visibility"}}
+							</div>
+							<div class="meta">
+								{{ $isPublic := index $.MembersIsPublicMember .ID}}
+								{{if $isPublic}}
+									<strong>{{$.i18n.Tr "org.members.public"}}</strong>
+									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}}
+								{{else}}
+									<strong>{{$.i18n.Tr "org.members.private"}}</strong>
+									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}}
+								{{end}}
+							</div>
+						</div><div class="ui three wide column center">
+							<div class="meta">
+								{{$.i18n.Tr "org.members.member_role"}}
+							</div>
+							<div class="meta">
+								<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
+							</div>
+						</div><div class="ui one wide column center">
+							<div class="meta">
+								2FA
+							</div>
+							<div class="meta">
+								<strong>
+									{{if index $.MembersTwoFaStatus .ID}}
+										<span class="text green">{{svg "octicon-check" 16}}</span>
+									{{else}}
+										{{svg "octicon-x" 16}}
+									{{end}}
+								</strong>
+							</div>
+						</div><div class="ui three wide column">
+							<div class="text right">
+								{{if eq $.SignedUser.ID .ID}}
+									<form method="post" action="{{$.OrgLink}}/members/action/leave">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.leave"}}</button>
+									</form>
+								{{else if $.IsOrganizationOwner}}
+									<form method="post" action="{{$.OrgLink}}/members/action/remove">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.remove"}}</button>
+									</form>
+								{{end}}
+							</div>
+						</div>
+					</div>
+				{{end}}
+			</div>
+			
+			{{template "base/paginate" .}}
+		</div>
+		
+	</div>
+</div>
+{{template "base/footer" .}}
-- 
2.34.1


From 9335c19b18c95995d4731c3f34875a1c30fa0a60 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 18 Jan 2022 09:37:56 +0800
Subject: [PATCH 14/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/repo_tag.go  | 6 +++---
 routers/org/home.go | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/models/repo_tag.go b/models/repo_tag.go
index 76740bd76d..895242bc52 100644
--- a/models/repo_tag.go
+++ b/models/repo_tag.go
@@ -41,7 +41,7 @@ type TagsDetail struct {
 	TagId    int64
 	TagName  string
 	TagLimit int
-	RepoList []Repository
+	RepoList []*Repository
 }
 
 func GetTagByID(id int64) (*OfficialTag, error) {
@@ -141,8 +141,8 @@ func GetAllOfficialTagRepos(orgID int64, isOwner bool) ([]TagsDetail, error) {
 	return result, nil
 }
 
-func GetOfficialTagDetail(orgID, tagId int64) ([]Repository, error) {
-	t := make([]Repository, 0)
+func GetOfficialTagDetail(orgID, tagId int64) ([]*Repository, error) {
+	t := make([]*Repository, 0)
 	const SQLCmd = "select t2.* from official_tag_repos t1 inner join repository t2 on t1.repo_id = t2.id where t1.org_id = ? and t1.tag_id=? order by t2.updated_unix desc"
 
 	if err := x.SQL(SQLCmd, orgID, tagId).Find(&t); err != nil {
diff --git a/routers/org/home.go b/routers/org/home.go
index b2c79a54f3..aaafec9d86 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -158,7 +158,7 @@ func Home(ctx *context.Context) {
 	if setting.Course.OrgName == org.Name {
 		for _, tag := range tags {
 			for _, repo := range tag.RepoList {
-				(&repo).GetCreator()
+				repo.GetCreator()
 			}
 		}
 
-- 
2.34.1


From 280ace63bd905ddd5c48dc05decd02d661df72e4 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 18 Jan 2022 11:46:37 +0800
Subject: [PATCH 15/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/course_list.tmpl  |  6 ++++--
 templates/org/home_courses.tmpl | 29 +++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 7cfbbbc672..dc07e0b21b 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -123,8 +123,10 @@
                     <div class=" extra " style="color:#888888;border-top: none !important;padding-top: 0px;">
                         <p class="time" style="font-size: 14px;">
                             
-                            <!-- <img class="ui avatar" src="{{.RelAvatarLink}}"> -->
-                            {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
+                            <img class="ui avatar" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}">
+
+                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
+                            
                             <!-- {{if .PrimaryLanguage }}
                             <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
                             {{end}} -->
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index a5b1e0ca3e..8f6230e4bb 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -63,7 +63,17 @@
 		margin: 0.2em;
 		margin-left: none;
 	}
-
+	.tag_key{
+		max-width:100%;
+		margin: 2px 2px;
+		display:inline-flex;
+	}
+   .bpadding{
+		padding:10px 40px
+   }
+   .omit{
+        overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
+    }
 </style>
 {{template "base/head" .}}
 <div class="organization profile">
@@ -148,16 +158,19 @@
 			<div class="ui sixteen wide computer column">
 				<div class="ui mobile reversed stackable grid">
 					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
-						<a class="ui small lable tag_lable topic tag_bg" style="margin-left: 0px;" >全部关键字</a>
+						<a class="tag_key " ><span class="ui small tag_lable topic omit tag_bg"  >全部关键字</span></a>
                         {{range .CoursesKeywords}}
-                            <a class="ui small lable tag_lable topic" >{{.}}</a>
+                            <!-- <a class="ui small lable tag_lable topic" >{{.}}</a> -->
+							<a  class="tag_key"  >
+								<span class="ui small tag_lable topic omit"  >{{.}}</span>
+							</a>
                         {{end}}
 					</div>
 				
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 						<!-- {{if .CanCreateOrgRepo}} -->
 							<div class="text center" style="margin-left: 10px;">
-								<a class="ui green button" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程{{.i18n.Tr "new_repo"}} </a>
+								<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程 </a>
 							</div>
 						<!-- {{end}} -->
 					</div>
@@ -196,6 +209,7 @@
 						<div class="ui attached table segment course items">
                             {{ range .tags}}
                                 {{if eq .TagName "精选项目"}}
+                               
                                     {{range $i, $v := .RepoList}}
                                         {{if gt $i 0}}
                                             <div class="ui divider" style="margin-bottom:10px;"></div>
@@ -205,8 +219,7 @@
                                             <div class="content"  style="margin-left: 10px;">
                                                 <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
-                                                    
-                                                    贡献者：
+                                                    贡献者：{{.Creator.Name}}
                                                 </p>
                                             </div>
                                         </div>
@@ -322,8 +335,8 @@
 				atag[i].onclick = function ()
 				{
 					for (i = 0; i < atag.length; i++)
-						atag[i].className = "ui small lable tag_lable topic";
-						this.className = "ui small lable tag_lable topic tag_bg";
+						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";
 				};
 		}
 	};
-- 
2.34.1


From b9851c6aa0d8ac2bc176c074ae0ab8d1b4cf8996 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Tue, 18 Jan 2022 15:20:39 +0800
Subject: [PATCH 16/63] fix issue

---
 modules/templates/helper.go | 2 ++
 modules/timeutil/since.go   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index da278ba323..3d31b611c0 100755
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -93,6 +93,7 @@ func NewFuncMap() []template.FuncMap {
 		"TimeSince":     timeutil.TimeSince,
 		"TimeSinceUnix": timeutil.TimeSinceUnix,
 		"TimeSinceUnix1": timeutil.TimeSinceUnix1,
+		"TimeSinceUnixShort": timeutil.TimeSinceUnixShort,
 		"RawTimeSince":  timeutil.RawTimeSince,
 		"FileSize":      base.FileSize,
 		"PrettyNumber":  base.PrettyNumber,
@@ -342,6 +343,7 @@ func NewTextFuncMap() []texttmpl.FuncMap {
 		"TimeSince":     timeutil.TimeSince,
 		"TimeSinceUnix": timeutil.TimeSinceUnix,
 		"TimeSinceUnix1": timeutil.TimeSinceUnix1,
+		"TimeSinceUnixShort": timeutil.TimeSinceUnixShort,
 		"RawTimeSince":  timeutil.RawTimeSince,
 		"DateFmtLong": func(t time.Time) string {
 			return t.Format(time.RFC1123Z)
diff --git a/modules/timeutil/since.go b/modules/timeutil/since.go
index a7854ed918..b19cc6401e 100755
--- a/modules/timeutil/since.go
+++ b/modules/timeutil/since.go
@@ -165,5 +165,8 @@ func htmlTimeSinceUnix(then, now TimeStamp, lang string) template.HTML {
 func TimeSinceUnix1(then TimeStamp) string {
 	format := time.Unix(int64(then), 0).Format("2006-01-02 15:04:05")
 	return format
-	
+}
+func TimeSinceUnixShort(then TimeStamp) string {
+	format := time.Unix(int64(then), 0).Format("2006-01-02")
+	return format
 }
-- 
2.34.1


From e26dae7c94a7ab28ac7930de776a0ae7943d0ac1 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 18 Jan 2022 16:52:47 +0800
Subject: [PATCH 17/63] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E8=81=94?=
 =?UTF-8?q?=E8=B0=83=E5=85=B3=E9=94=AE=E8=AF=8D=20=E7=B2=BE=E9=80=89?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/course_list.tmpl      | 37 ++++++++--------------
 templates/org/home_courses.tmpl     | 42 +++++++++++++------------
 templates/org/team/courseTeams.tmpl | 48 +++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 44 deletions(-)

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index dc07e0b21b..4c63922761 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -67,7 +67,11 @@
         background-color: #B3DBDB !important;
         font-weight:normal !important
     }
-
+    .tag_text{
+        /* margin-top: 2px; */
+        /* margin-left: 0.5em; */
+        font-size: 14px;
+    }
 
 </style>
 <!-- <div class="ui stackable grid"> -->
@@ -120,29 +124,14 @@
                                                         
                         
                     </div>
-                    <div class=" extra " style="color:#888888;border-top: none !important;padding-top: 0px;">
-                        <p class="time" style="font-size: 14px;">
-                            
-                            <img class="ui avatar" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}">
-
-                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp;{{.CreatedUnix.FormatShort}} 
-                            
-                            <!-- {{if .PrimaryLanguage }}
-                            <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
-                            {{end}} -->
-                        </p>
-                        <!-- <div class="ui mini right compact marg" >
-                            <a class="item marg ">
-                                {{svg "octicon-eye" 16}} {{.NumWatches}}
-                            </a>
-                            <a class="item marg">
-                                {{svg "octicon-star" 16}} {{.NumStars}}
-                            </a>
-                            <a class="item marg">
-                                {{svg "octicon-git-branch" 16}} {{.NumForks}}
-                            </a>
-                            
-                        </div> -->
+                    <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;">                            
+                        <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
+                        <div class="left aligned author">
+                        <!-- <span > -->
+                            <img class="ui avatar image" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}"> 
+                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
+                        <!-- </span> -->
+                        </div>
                     </div>
                 </div>   
             {{end}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 8f6230e4bb..771e8e7f98 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -65,7 +65,7 @@
 	}
 	.tag_key{
 		max-width:100%;
-		margin: 2px 2px;
+		margin: 3px 3px;
 		display:inline-flex;
 	}
    .bpadding{
@@ -158,11 +158,12 @@
 			<div class="ui sixteen wide computer column">
 				<div class="ui mobile reversed stackable grid">
 					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
-						<a class="tag_key " ><span class="ui small tag_lable topic omit tag_bg"  >全部关键字</span></a>
+	
+						<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="tag_key"  >
-								<span class="ui small tag_lable topic omit"  >{{.}}</span>
+							<a  class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" >
+								 {{.}}
 							</a>
                         {{end}}
 					</div>
@@ -217,7 +218,7 @@
                                         <div class="item">
                                             <i class="ri-bookmark-3-line course_color" ></i>
                                             <div class="content"  style="margin-left: 10px;">
-                                                <a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Alias}}</strong></a>
+                                                <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
                                                     贡献者：{{.Creator.Name}}
                                                 </p>
@@ -325,21 +326,22 @@
 	// 	// this.classList.add("tag_bg")
 	// }
 
-	window.onload = function ()
-	{
-		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";
-				};
-		}
-	};
+	// 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=[];
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index e69de29bb2..e7081b58fa 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -0,0 +1,48 @@
+{{template "base/head" .}}
+<div class="organization teams">
+	{{template "org/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}
+		{{template "org/navber" .}}
+		<div class="ui stackable grid">
+		
+		
+			
+			<div class="ui sixteen wide computer column list">
+				<div class="ui two column grid">
+			{{range .Teams}}
+					<div class="column">
+						<div class="ui top attached header">
+							<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.Name}}</strong></a>
+							<div class="ui right">
+								{{if .IsMember $.SignedUser.ID}}
+									<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/leave">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui red small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.leave"}}</button>
+									</form>
+								{{else if $.IsOrganizationOwner}}
+									<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName}}/action/join">
+										{{$.CsrfTokenHtml}}
+										<button type="submit" class="ui blue small button" name="uid" value="{{$.SignedUser.ID}}">{{$.i18n.Tr "org.teams.join"}}</button>
+									</form>
+								{{end}}
+							</div>
+						</div>
+						<div class="ui attached segment members">
+							{{range .Members}}
+								<a href="{{.HomeLink}}" title="{{.Name}}">
+									<img class="ui avatar image" src="{{.RelAvatarLink}}">
+								</a>
+							{{end}}
+						</div>
+						<div class="ui bottom attached header">
+							<p class="team-meta">{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · {{.NumRepos}} {{$.i18n.Tr "org.lower_repositories"}}</p>
+						</div>
+					</div>
+			{{end}}
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}
-- 
2.34.1


From 9e750cada5f4794fd4ee26f3e0fb0abc3cc24b13 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 18 Jan 2022 17:20:01 +0800
Subject: [PATCH 18/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/repository/create.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/repository/create.go b/modules/repository/create.go
index 2a24cb7086..0844c43c3d 100644
--- a/modules/repository/create.go
+++ b/modules/repository/create.go
@@ -43,6 +43,7 @@ func CreateRepository(doer, u *models.User, opts models.CreateRepoOptions) (_ *m
 		Status:                          opts.Status,
 		IsEmpty:                         !opts.AutoInit,
 		RepoType:                        RepoType,
+		Topics:                          opts.Topics,
 	}
 
 	err = models.WithTx(func(ctx models.DBContext) error {
-- 
2.34.1


From c30a7bbf6ec440743dc7b9946ec2e242c17425a1 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 18 Jan 2022 17:41:15 +0800
Subject: [PATCH 19/63] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=8C=89=E5=BA=93=E7=B1=BB=E5=9E=8B=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=89=80=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/home.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routers/org/home.go b/routers/org/home.go
index aaafec9d86..4eff151bfc 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -91,7 +91,6 @@ func Home(ctx *context.Context) {
 	var CourseOptional util.OptionalBool = util.OptionalBoolNone
 	if setting.Course.OrgName == org.Name {
 		pageSize = 15
-		CourseOptional = util.OptionalBoolTrue
 		recommendCourseKeyWords, _ := repository.GetRecommendCourseKeyWords()
 		ctx.Data["CoursesKeywords"] = recommendCourseKeyWords
 
-- 
2.34.1


From b8ace566100df2d5849fc59904ac64f8dd7e3fc5 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 19 Jan 2022 09:12:20 +0800
Subject: [PATCH 20/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/course.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routers/repo/course.go b/routers/repo/course.go
index 013ee20da0..9cdb5c12e7 100644
--- a/routers/repo/course.go
+++ b/routers/repo/course.go
@@ -34,6 +34,10 @@ func CreateCoursePost(ctx *context.Context, form auth.CreateCourseForm) {
 		return
 	}
 
+	org, _ := models.GetUserByName(setting.Course.OrgName)
+
+	ctx.Data["Owner"] = org
+
 	var topics = make([]string, 0)
 	var topicsStr = strings.TrimSpace(form.Topics)
 	if len(topicsStr) > 0 {
-- 
2.34.1


From 5f7a306d9c7cbdde3762556d9df8077f94e537c3 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Wed, 19 Jan 2022 10:56:27 +0800
Subject: [PATCH 21/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/course_list.tmpl           | 10 ++++--
 templates/org/header.tmpl                |  1 +
 templates/org/home_courses.tmpl          | 46 +++++++++---------------
 templates/org/member/course_members.tmpl | 30 +++++++++++++++-
 templates/org/navber_course.tmpl         | 28 +++++++++++++++
 templates/org/team/courseTeams.tmpl      | 10 +++++-
 6 files changed, 92 insertions(+), 33 deletions(-)
 create mode 100644 templates/org/navber_course.tmpl

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 4c63922761..1f43780364 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -128,8 +128,14 @@
                         <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
                         <div class="left aligned author">
                         <!-- <span > -->
-                            <img class="ui avatar image" style="width: 22px;height:22px;" src="{{.Creator.RelAvatarLink}}"> 
-                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
+                            <!-- {{.Creator}} -->
+                            {{if .Creator}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}"> 
+                            {{else}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}"> 
+                            {{end}}
+
+                            {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
                         <!-- </span> -->
                         </div>
                     </div>
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index a2ceaac5f8..01d15a4cd0 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -25,3 +25,4 @@
 	</div>
 </div>
 
+
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 771e8e7f98..a06f06c208 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -1,7 +1,9 @@
 <style>
+
 	.organization-info_1000{
 		background: #F5F5F6 !important;
-
+		padding-top: 30px;
+		margin-bottom: 0px !important;
 	}
 	.organization-info >.container {
 		overflow: auto;
@@ -35,7 +37,7 @@
 		color:#FFFFFF !important;
 	}
 	.course{
-		padding: 10px 15px !important;
+		padding:10px 0 15px !important;
 	}
 	.course_color{
 		color: #FA8C16;
@@ -74,6 +76,9 @@
    .omit{
         overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
     }
+	.noborder{
+		border: none !important;
+	}
 </style>
 {{template "base/head" .}}
 <div class="organization profile">
@@ -113,28 +118,11 @@
 					{{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 class="ui tabs container">
-			<div class="ui tabular stackable menu navbar">
-				{{with .Org}}
-					<a class="{{if $.PageIsOrgHome}}active{{end}} item " href="{{.HomeLink}}">
-						{{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
-					</a>
-				{{end}}
-				<a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
-					{{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
-				</a>
-				{{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
-					<a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
-						{{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
-					</a>
-				{{end}}
-				{{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
-			</div>
+		</div>		
+	</div>
+		{{template "org/navber_course" .}}
 
-		</div>
 
-	</div>
 		<!-- <div class="ui  container " style="overflow: auto">
 			<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
 			<p id="org-info">
@@ -197,7 +185,7 @@
 
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 
-						<h4 class="ui top attached header">
+						<h4 class="ui top attached header noborder">
 							<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
 							<div class="ui right">
 								<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
@@ -207,7 +195,7 @@
 							<!-- {{end}} -->
 						</h4>
                
-						<div class="ui attached table segment course items">
+						<div class="ui attached table segment course items noborder">
                             {{ range .tags}}
                                 {{if eq .TagName "精选项目"}}
                                
@@ -232,7 +220,7 @@
 						</div>
 
 						
-						<h4 class="ui top attached header">
+						<h4 class="ui top attached header noborder">
 							<strong>{{.i18n.Tr "org.people"}}</strong>
 							<div class="ui right">
 								<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
@@ -241,7 +229,7 @@
 								
 							<!-- {{end}} -->
 						</h4>
-						<div class="ui attached segment members">
+						<div class="ui attached segment members noborder">
 							{{$isMember := .IsOrganizationMember}}
 							{{range .Members}}
 								{{if or $isMember (.IsPublicMember $.Org.ID)}}
@@ -255,13 +243,13 @@
 						</div>
 
 						{{if .IsOrganizationMember}}
-							<div class="ui top attached header">
+							<div class="ui top attached header noborder">
 								<strong>{{.i18n.Tr "org.teams"}}</strong>
 								<div class="ui right">
 									<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
 								</div>
 							</div>
-							<div class="ui attached table segment teams">
+							<div class="ui attached table segment teams noborder">
 								{{range .Teams}}
 									<div class="item">
 										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
@@ -273,7 +261,7 @@
 								{{end}}
 							</div>
 							{{if .IsOrganizationOwner}}
-								<div class="ui bottom attached segment">
+								<div class="ui bottom attached segment noborder">
 									<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
 								</div>
 							{{end}}
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 87189c0157..74a2e4b7c9 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -1,9 +1,16 @@
+<style>
+    .organization-header{
+        margin-bottom: 0px !important;
+        border-bottom:none !important
+    }
+</style>
+
 {{template "base/head" .}}
 <div class="organization members">
 	{{template "org/header" .}}
+	{{template "org/navber_course" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{template "org/navber" .}}
 		<div class="ui stackable grid">
 		
 			
@@ -67,6 +74,27 @@
 					</div>
 				{{end}}
 			</div>
+
+			<!-- <div class="ui three cards" style="margin-bottom: 10px;">
+				{{ range .Members}}
+				
+					<div class="card" >
+						<div class="image">
+							<img src="/images/avatar2/large/kristy.png">
+						  </div>
+						  <div class="content">
+							<a class="header">Kristy</a>
+							<div class="meta">
+							  <span class="date">Joined in 2013</span>
+							</div>
+							<div class="description">
+							  Kristy is an art director living in New York.
+							</div>
+						</div>
+					</div>
+				{{end}}
+
+			</div> -->
 			
 			{{template "base/paginate" .}}
 		</div>
diff --git a/templates/org/navber_course.tmpl b/templates/org/navber_course.tmpl
new file mode 100644
index 0000000000..4bd5084821
--- /dev/null
+++ b/templates/org/navber_course.tmpl
@@ -0,0 +1,28 @@
+<style>
+    .navber_course{
+		background: #F5F5F6 !important;
+		padding-top: 30px;
+		margin-bottom: 20px;
+	}
+</style>
+<div class="navber_course">
+    <div class="ui tabs container">
+        <div class="ui tabular stackable menu navbar">
+            {{with .Org}}
+                <a class="{{if $.PageIsOrgHome}}active{{end}} item " href="{{.HomeLink}}">
+                    {{svg "octicon-home" 16}}&nbsp;{{$.i18n.Tr "org.home"}}
+                </a>
+            {{end}}
+            <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
+                {{svg "octicon-organization" 16}}&nbsp;{{$.i18n.Tr "org.people"}}
+            </a>
+            {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}}
+                <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
+                    {{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
+                </a>
+            {{end}}
+            {{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
+        </div>
+
+    </div>
+</div>
\ No newline at end of file
diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl
index e7081b58fa..13557888c0 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -1,9 +1,17 @@
+<style>
+    .organization-header{
+        margin-bottom: 0px !important;
+        border-bottom:none !important
+    }
+</style>
 {{template "base/head" .}}
 <div class="organization teams">
 	{{template "org/header" .}}
+	{{template "org/navber_course" .}}
+
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{template "org/navber" .}}
+
 		<div class="ui stackable grid">
 		
 		
-- 
2.34.1


From c4fe06151e7ea370c70fbb0c1f7e01b69f1dd049 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 19 Jan 2022 11:34:16 +0800
Subject: [PATCH 22/63] fix issue

---
 templates/explore/dataset_list.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/explore/dataset_list.tmpl b/templates/explore/dataset_list.tmpl
index 7abc03363a..242f99dc90 100755
--- a/templates/explore/dataset_list.tmpl
+++ b/templates/explore/dataset_list.tmpl
@@ -26,7 +26,7 @@
       <div class="item">
         <div class="ui header">
           <a class="name" href="{{.Repo.Link}}/datasets?type=0">
-            {{.Repo.OwnerName}} / {{.Title}}
+            {{.Repo.OwnerName}} / {{.Repo.Alias}}
           </a>
           <div class="ui right metas">
             {{if .Task}}
@@ -53,4 +53,4 @@
       </div>
     {{end}}
   </div>
-</div>
+</div>
\ No newline at end of file
-- 
2.34.1


From 588ac6edb551bc5ddecc8b9d6298050550d632d6 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 19 Jan 2022 11:38:31 +0800
Subject: [PATCH 23/63] fix issue

---
 options/locale/locale_en-US.ini | 1 +
 options/locale/locale_zh-CN.ini | 1 +
 2 files changed, 2 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2902d603c7..3ca08ca4fc 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -51,6 +51,7 @@ organization = Organization
 mirror = Mirror
 new_repo = New Repository
 new_course=Publish Course
+course_desc = Course Description
 new_migrate = New Migration
 new_dataset = New Dataset
 edit_dataset = Edit Dataset
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 934f6c9760..7b95d33ea8 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -51,6 +51,7 @@ organization=组织
 mirror=镜像
 new_repo=创建项目
 new_course=发布课程
+course_desc=发布课程
 new_dataset=创建数据集
 new_migrate=迁移外部项目
 edit_dataset = Edit Dataset
-- 
2.34.1


From 3d6ee0c573dd3aebef23a3e98e92e6d5e87f55e3 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 19 Jan 2022 11:39:53 +0800
Subject: [PATCH 24/63] fix issue

---
 options/locale/locale_zh-CN.ini  | 2 +-
 templates/repo/createCourse.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 7b95d33ea8..94170cc9d7 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -51,7 +51,7 @@ organization=组织
 mirror=镜像
 new_repo=创建项目
 new_course=发布课程
-course_desc=发布课程
+course_desc=课程描述
 new_dataset=创建数据集
 new_migrate=迁移外部项目
 edit_dataset = Edit Dataset
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index d2a77eea9a..96266feed7 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -48,7 +48,7 @@
                     </div>
 
 					<div class="inline field {{if .Err_Description}}error{{end}}">
-						<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
+						<label for="description">{{.i18n.Tr "course_desc"}}</label>
 						<textarea id="description" name="description" maxlength="254">{{.description}}</textarea>
 					</div>
 					<div class="inline field">
-- 
2.34.1


From df75bcc71c6f3e04a373d3350c4dad8fb02385fc Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 19 Jan 2022 11:50:44 +0800
Subject: [PATCH 25/63] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/home.go             | 1 +
 templates/org/course_list.tmpl  | 7 +++----
 templates/org/home_courses.tmpl | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/routers/org/home.go b/routers/org/home.go
index 4eff151bfc..c9769f5596 100755
--- a/routers/org/home.go
+++ b/routers/org/home.go
@@ -158,6 +158,7 @@ func Home(ctx *context.Context) {
 		for _, tag := range tags {
 			for _, repo := range tag.RepoList {
 				repo.GetCreator()
+				repo.GetOwner()
 			}
 		}
 
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 1f43780364..6313ad0102 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -128,11 +128,10 @@
                         <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
                         <div class="left aligned author">
                         <!-- <span > -->
-                            <!-- {{.Creator}} -->
-                            {{if .Creator}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}"> 
+                            {{if ne .CreatorID 0}}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}">
                             {{else}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}"> 
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}">
                             {{end}}
 
                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index a06f06c208..70ea9b4211 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -208,7 +208,11 @@
                                             <div class="content"  style="margin-left: 10px;">
                                                 <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
+												    {{if ne .CreatorID 0}}
                                                     贡献者：{{.Creator.Name}}
+													{{else}}
+													贡献者：{{.Owner.Name}}
+													{{end}}
                                                 </p>
                                             </div>
                                         </div>
-- 
2.34.1


From 22bfbf350dfb245d3e969fb6cb430b2ca2adea40 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 19 Jan 2022 14:53:56 +0800
Subject: [PATCH 26/63] fix issue

---
 templates/repo/createCourse.tmpl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 96266feed7..9417001d71 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -39,9 +39,9 @@
 
                     <div class="inline required field">
                         <label>{{.i18n.Tr "repo.model.manage.label"}}</label>
-                        <div class="ui multiple search selection dropdown">
+                        <div class="ui multiple search selection dropdown" id="dropdown_container">
                             <input type="hidden" name="topics" value="">
-                            <div class="default text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
+                            <div class="default text" id="default_text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
                             <div class="menu" id="course_label_item">
                             </div>
                         </div>
@@ -75,7 +75,11 @@ $(document).ready(function(){
             $('#course_label_item').empty()
         }
     })
+    let defaultText = document.getElementById("default_text").offsetHeight
+    defaultText = defaultText>40 ? defaultText+12 :defaultText
+    $("#dropdown_container").css("height",defaultText)
     $('input.search').bind('input propertychange', function (event) {
+        $("#dropdown_container").removeAttr("style"); 
         const query  = $('input.search').val()
         if(!query){
             $('#course_label_item').empty()
-- 
2.34.1


From 6b982ba6b1122560a06dc9e21c7ae2c42020849e Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Wed, 19 Jan 2022 17:14:47 +0800
Subject: [PATCH 27/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/view.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/routers/repo/view.go b/routers/repo/view.go
index b08243240f..320102ba40 100755
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -35,6 +35,7 @@ import (
 const (
 	tplRepoEMPTY    base.TplName = "repo/empty"
 	tplRepoHome     base.TplName = "repo/home"
+	tplCourseHome   base.TplName = "repo/courseHome"
 	tplWatchers     base.TplName = "repo/watchers"
 	tplForks        base.TplName = "repo/forks"
 	tplMigrating    base.TplName = "repo/migrating"
@@ -855,7 +856,12 @@ func renderCode(ctx *context.Context) {
 	ctx.Data["TreeLink"] = treeLink
 	ctx.Data["TreeNames"] = treeNames
 	ctx.Data["BranchLink"] = branchLink
-	ctx.HTML(200, tplRepoHome)
+	if ctx.Repo.Repository.RepoType == models.RepoCourse {
+		ctx.HTML(200, tplCourseHome)
+	} else {
+		ctx.HTML(200, tplRepoHome)
+	}
+
 }
 
 // RenderUserCards render a page show users according the input templaet
-- 
2.34.1


From d5ce4c8f0b6d22c2a674bf6a2599df55644be34c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 20 Jan 2022 10:35:04 +0800
Subject: [PATCH 28/63] fix issue

---
 templates/repo/courseHome.tmpl | 301 +++++++++++++++++++++++++++++++++
 1 file changed, 301 insertions(+)
 create mode 100644 templates/repo/courseHome.tmpl

diff --git a/templates/repo/courseHome.tmpl b/templates/repo/courseHome.tmpl
new file mode 100644
index 0000000000..3f2cbe01af
--- /dev/null
+++ b/templates/repo/courseHome.tmpl
@@ -0,0 +1,301 @@
+{{template "base/head" .}}
+<style>
+.repository.file.list #repo-desc {
+    font-size: 1.0em;
+    margin-bottom: 1.0rem;
+}
+#contributorInfo > a:nth-child(n+26){
+	display:none;
+}
+#contributorInfo > a{
+	width: 2.0em;
+	float: left;
+	margin: .25em;
+}
+.edit-link{
+	vertical-align: top;
+    display: inline-block;
+    overflow: hidden;
+    word-break: keep-all;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 16.5em;
+}
+#contributorInfo > a.circular{
+	height: 2.0em;
+	padding: 0;
+	overflow: hidden;
+	letter-spacing:1.0em;
+	text-indent: 0.6em;
+	line-height: 2.0em;
+	text-transform:capitalize;
+	color: #FFF;
+}
+#contributorInfo > a.circular:nth-child(9n+1){
+	background-color: #4ccdec;
+}
+#contributorInfo > a.circular:nth-child(9n+2){
+	background-color: #e0b265;
+}
+#contributorInfo > a.circular:nth-child(9n+3){
+	background-color: #d884b7;
+}
+#contributorInfo > a.circular:nth-child(9n+4){
+	background-color: #8c6bdc;
+}
+#contributorInfo > a.circular:nth-child(9n+5){
+	background-color: #3cb99f;
+}
+#contributorInfo > a.circular:nth-child(9n+6){
+	background-color: #6995b9;
+}
+#contributorInfo > a.circular:nth-child(9n+7){
+	background-color: #ab91a7;
+}
+#contributorInfo > a.circular:nth-child(9n+8){
+	background-color: #bfd0aa;
+}
+.vue_menu {
+    cursor: auto;
+    position: absolute;
+    outline: none;
+    margin: 0em;
+    padding: 0em 0em;
+    background: #fff;
+    font-size: 1em;
+    text-shadow: none;
+    text-align: left;
+    /* -webkit-box-shadow: 0px 2px 3px 0px rgb(34 36 38 / 15%); */
+    box-shadow: 0px 2px 3px 0px rgba(34, 36, 38, 0.15);
+    border: 1px solid rgba(34,36,38,0.15);
+    border-radius: 0.28571429rem;
+    -webkit-transition: opacity 0.1s ease;
+    transition: opacity 0.1s ease;
+    z-index: 11;
+    will-change: transform, opacity;
+	-webkit-animation-iteration-count: 1;
+    animation-iteration-count: 1;
+    -webkit-animation-duration: 300ms;
+    animation-duration: 300ms;
+    -webkit-animation-timing-function: ease;
+    animation-timing-function: ease;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+}
+.repo-topic{
+    background-color: rgba(179, 219, 219, 0.4) !important;
+    color: #0366D6 !important;
+    font-weight: 200 !important;
+}
+
+
+
+</style>
+<div class="repository file list">
+	{{template "repo/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}		
+        <div class="hide" id="validate_prompt">
+            <span id="count_prompt">{{.i18n.Tr "repo.topic.count_prompt"}}</span>
+            <span id="format_prompt">{{.i18n.Tr "repo.topic.format_prompt"}}</span>
+        </div>
+		{{if .Repository.IsArchived}}
+			<div class="ui warning message">
+				{{.i18n.Tr "repo.archive.title"}}
+			</div>
+		{{end}}
+        <div>
+            <span>简介：</span>
+            {{if .Repository.DescriptionHTML}}
+                <span class="description" style="color: #8a8e99;">{{.Repository.DescriptionHTML}}</span>
+            {{else}}
+                <span class="no-description text-italic">{{.i18n.Tr "repo.no_desc"}}</span>
+            {{end}}
+            <!-- <span style="color: #8a8e99;">生课程的教学，在全国范围形成一批开放共享的教学材料。这类材料的风格、设想既不同于教材，也不同于IEEE CSs中对知识体系的描述，而是以一定的知识内容为背景，重在教师个人在教学实践中的心得，包括对某些内容独到的理解和课堂上的处理，等等。</span> -->
+        </div>
+        <div class="ui" id="repo-topics">
+            <div id="repo-topics1" style="display: inline-block;margin: 0.5rem 0;">
+                {{range .Topics}}
+                    <a class="ui repo-topic small label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=">{{.Name}}</a>
+                {{end}}
+                
+            </div>
+            <a style="margin-left: 0.5rem;" id="manage_topic">
+                {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<i  style="cursor: pointer;" class="plus square outline icon"></i>{{end}}添加标签
+            </a>
+                
+            <div id="topic_edit" class="vue_menu" style="display:none;">
+                <div id="topic_edit1">
+
+                </div>
+            </div>
+
+        </div>
+
+
+
+		<div class="ui mobile reversed stackable grid">
+			
+			{{ $n := len .TreeNames}}
+			{{ $l := Subtract $n 1}}
+            <!-- If home page, show new PR. If not, show breadcrumb -->
+            <div class="ui ten wide tablet twelve wide computer column text right" style="margin-top: 1rem;">
+                <div class="right fitted item" id="file-buttons">
+                    <div class="ui tiny blue buttons">
+                        {{if .Repository.CanEnableEditor}}
+                            {{if .CanAddFile}}
+                                <a href="{{.RepoLink}}/_new/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}" class="ui button">
+                                    {{.i18n.Tr "repo.editor.new_file"}}
+                                </a>
+                            {{end}}
+                            {{if .CanUploadFile}}
+                                <a href="{{.RepoLink}}/_upload/{{EscapePound .BranchName}}/{{EscapePound .TreePath}}" class="ui button">
+                                    {{.i18n.Tr "repo.editor.upload_file"}}
+                                </a>
+                            {{end}}
+                        {{end}}
+                        {{if and (ne $n 0) (not .IsViewFile) (not .IsBlame) }}
+                            <a href="{{.RepoLink}}/commits/{{EscapePound .BranchNameSubURL}}/{{EscapePound .TreePath}}" class="ui button">
+                                {{.i18n.Tr "repo.file_history"}}
+                            </a>
+                        {{end}}
+                    </div>
+                </div>
+            </div>
+			
+			
+		</div>
+		<div class="ui container">
+			<div class="ui mobile reversed stackable grid">
+				<div class="ui ten wide tablet twelve wide computer column">
+					{{if .IsViewFile}}
+						{{template "repo/view_file" .}}
+					{{else if .IsBlame}}
+						{{template "repo/blame" .}}
+					{{else}}
+                        <table id="repo-files-table" class="ui single line table">
+                            <thead>
+                                <tr class="commit-list">
+                                    <th colspan="2">
+                                        {{if .LatestCommitUser}}
+                                            <img class="ui avatar image img-12" src="{{.LatestCommitUser.RelAvatarLink}}" />
+                                            {{if .LatestCommitUser.FullName}}
+                                                <a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{.LatestCommitUser.FullName}}</strong></a>
+                                            {{else}}
+                                                <a href="{{AppSubUrl}}/{{.LatestCommitUser.Name}}"><strong>{{if .LatestCommit.Author}}{{.LatestCommit.Author.Name}}{{else}}{{.LatestCommitUser.Name}}{{end}}</strong></a>
+                                            {{end}}
+                                        {{else}}
+
+                                            {{if .LatestCommit.Author}}
+                                                <img class="ui avatar image img-12" src="{{AvatarLink .LatestCommit.Author.Email}}" />
+                                                <strong>{{.LatestCommit.Author.Name}}</strong>
+                                            {{end}}
+                                        {{end}}
+                                        
+                                        {{if .LatestCommit.Author}}
+                                            <span style="margin: 0 0.5rem;color: #767676">{{TimeSince .LatestCommit.Author.When $.Lang}}</span>
+                                        {{end}}
+                                        {{ $commitLink:= printf "%s/commit/%s" .RepoLink .LatestCommit.ID }}
+                                        <span class="grey commit-summary" title="{{.LatestCommit.Summary}}"><span class="message-wrapper">{{RenderCommitMessageLinkSubject .LatestCommit.Message $.RepoLink $commitLink $.Repository.ComposeMetas}}</span>
+                                        {{if IsMultilineCommitMessage .LatestCommit.Message}}
+                                            <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
+                                            <pre class="commit-body" style="display: none;">{{RenderCommitBody .LatestCommit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
+                                        {{end}}
+                                        </span>
+                                    </th>
+                                    
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {{if .HasParentPath}}
+                                    <tr class="has-parent">
+                                        <td colspan="3">{{svg "octicon-mail-reply" 16}}<a href="{{EscapePound .BranchLink}}{{.ParentPath}}">..</a></td>
+                                    </tr>
+                                {{end}}
+                                {{range $item := .Files}}
+                                    {{$entry := index $item 0}}
+                                    {{$commit := index $item 1}}
+                                    <tr>
+                                        {{if $entry.IsSubModule}}
+                                            <td>
+                                                <span class="truncate">
+                                                    {{svg "octicon-inbox" 16}}
+                                                    {{$refURL := $commit.RefURL AppUrl $.Repository.FullName}}
+                                                    {{if $refURL}}
+                                                        <a href="{{$refURL}}">{{$entry.Name}}</a> @ <a href="{{$refURL}}/commit/{{$commit.RefID}}">{{ShortSha $commit.RefID}}</a>
+                                                    {{else}}
+                                                        {{$entry.Name}} @ {{ShortSha $commit.RefID}}
+                                                    {{end}}
+                                                </span>
+                                            </td>
+                                        {{else}}
+                                            <td class="name thirteen wide">
+                                                <span class="truncate">
+                                                    {{if $entry.IsDir}}
+                                                        {{$subJumpablePathName := $entry.GetSubJumpablePathName}}
+                                                        {{$subJumpablePath := SubJumpablePath $subJumpablePathName}}
+                                                        {{svg "octicon-file-directory" 16}}
+                                                        <a href="{{EscapePound $.TreeLink}}/{{EscapePound $subJumpablePathName}}" title="{{$subJumpablePathName}}">
+                                                            {{if eq (len $subJumpablePath) 2}}
+                                                                <span class="jumpable-path">{{index  $subJumpablePath 0}}</span>{{index  $subJumpablePath 1}}
+                                                            {{else}}
+                                                                {{index $subJumpablePath 0}}
+                                                            {{end}}
+                                                        </a>
+                                                    {{else}}
+                                                   
+                                                        <i class="ri-file-pdf-line" style="font-size: 16px;margin-left: 3px;margin-right: 5px;vertical-align: text-top;color: #FA8C16;"></i>
+                                                        <a href="{{EscapePound $.TreeLink}}/{{EscapePound $entry.Name}}" title="{{$entry.Name}}">{{$entry.Name}}</a>
+                                                    {{end}}
+                                                </span>
+                                            </td>
+                                        {{end}}
+                                        
+                                        <!-- <td class="message nine wide">
+                                            <span class="truncate">
+                                                <a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary | RenderEmoji}}</a>
+                                            </span>
+                                        </td> -->
+                                        <td class="text right age one wide" style="text-align: right;">{{TimeSince $commit.Committer.When $.Lang}}</td>
+                                    </tr>
+                                {{end}}
+                            </tbody>
+                        </table>
+                        {{if .ReadmeExist}}
+                            {{template "repo/view_file" .}}
+                        {{end}}
+					{{end}}
+                </div>
+                <!-- 贡献者框 -->
+				<div class="ui six wide tablet four wide computer column">			
+					<div style="border-radius: 5px;border: 1px solid rgba(225, 227, 230, 100);padding: 1rem;">
+						<h4 class="ui header" style="border-bottom: 1px solid rgba(225, 227, 230, 100);padding: 0.5rem 0;">
+							{{$lenCon := len .ContributorInfo}}
+							{{if lt $lenCon 25 }}
+							<strong>贡献者 ({{len .ContributorInfo}})</strong>
+							{{else}}
+							<strong>贡献者 ({{len .ContributorInfo}}+)</strong>
+							{{end}}
+							<div class="ui right">
+								<a class="membersmore text grey" href="{{.RepoLink}}/contributors?type={{if .IsViewBranch}}branch{{else}}tag{{end}}&name={{.BranchName}}">全部 {{svg "octicon-chevron-right" 16}}</a>
+							</div>
+						</h4>
+						<div class="ui members" id="contributorInfo">
+							{{range .ContributorInfo}}
+								{{if .UserInfo}}
+									<a href="{{AppSubUrl}}/{{.UserInfo.Name}}"><img class="ui avatar image" src="{{.UserInfo.RelAvatarLink}}"></a>
+								{{else if .Email}}
+									<a href="mailto:{{.Email}}" class="circular ui button">{{.Email}}</a>
+								{{end}}
+							{{end}}
+                        </div>
+                        <div style="clear: both;"></div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</div>
+
+{{template "base/footer" .}}
-- 
2.34.1


From 0da4ae1d7f8040eb80566cf502c12a7d87d886c6 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Thu, 20 Jan 2022 11:38:14 +0800
Subject: [PATCH 29/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini          |   2 +
 options/locale/locale_zh-CN.ini          |   2 +
 templates/org/member/course_members.tmpl | 164 +++++++++++++----------
 templates/repo/view_list.tmpl            |   8 +-
 4 files changed, 103 insertions(+), 73 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 3ca08ca4fc..0d5c1db14b 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2096,6 +2096,8 @@ members.remove = Remove
 members.leave = Leave
 members.invite_desc = Add a new member to %s:
 members.invite_now = Invite Now
+course_members.remove = Remove
+course_members.leave = Leave
 
 teams.join = Join
 teams.leave = Leave
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 94170cc9d7..aefe62b952 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2109,6 +2109,8 @@ members.remove=移除成员
 members.leave=离开组织
 members.invite_desc=邀请新的用户加入 %s：
 members.invite_now=立即邀请
+course_members.remove=移除
+course_members.leave=离开
 
 teams.join=加入团队
 teams.leave=离开团队
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 74a2e4b7c9..fbcaef2e6f 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -3,6 +3,45 @@
         margin-bottom: 0px !important;
         border-bottom:none !important
     }
+	.course_header{
+		color: rgba(3, 102, 214, 100);
+		font-size: 16px;
+		text-align: left;
+		font-family: SourceHanSansSC-medium;
+		font-weight: bolder;
+		vertical-align: bottom;
+	}
+	.meb_label{
+		border-radius: 5px;
+		background-color: rgba(255, 255, 255, 100) !important;
+		color: rgba(255, 255, 255, 100);
+		font-size: 12px;
+		text-align: center;
+		font-family: Roboto;
+		border: 1px solid rgba(212, 212, 213, 100) !important;
+		margin-left: 1em !important;
+	}
+	.ui.small.label.topic {
+    	margin-bottom: 0px !important;
+	}
+	.cor{
+		color:#888888 !important
+	}
+	.card_course{
+		padding:1em;
+		border: 1px solid #F5F5F6;
+		margin:1em;box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60);
+		border-radius: 5px;border: 1px solid rgba(232, 232, 232, 100);
+		display: flex; width:calc(33.33333333333333% - 2em)
+	}
+	.button_leaveOrg{
+		position:absolute;right: -1px;top:0px;
+	}
+	.bt_mr{
+		margin-right: 0px !important;
+		font-size: 12px !important;
+		padding: 5px !important;
+	}
 </style>
 
 {{template "base/head" .}}
@@ -13,88 +52,64 @@
 		{{template "base/alert" .}}
 		<div class="ui stackable grid">
 		
-			
+		
 			<div class="ui sixteen wide computer column list">
-				{{ range .Members}}
-					<div class="item ui grid">
-						<div class="ui two wide column">
-							<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
-						</div><div class="ui three wide column">
-							<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
-							<div class="meta">{{.FullName}}</div>
-						</div><div class="ui four wide column center">
-							<div class="meta">
-								{{$.i18n.Tr "org.members.membership_visibility"}}
-							</div>
-							<div class="meta">
+				<div class="ui three cards" >
+				{{ range .Members}}			
+					<div  class="card_course" style="position: relative;" id = "{{.ID}}" onmouseover ="show_bt( {{.ID}}  )" onmouseout="hide_bt({{.ID}})">
+						<div >
+							<img class="ui avatar " style="width: 45px;height:45px;margin-top: 2px;" src="{{.SizedRelAvatarLink 48}}">
+							<!-- <a style="display: block;font-size: 12px;text-align: center;margin-top: 0.5em;">显示</a> -->
+							<div class="meta" style="text-align: center; margin-top: 0.5em;">
 								{{ $isPublic := index $.MembersIsPublicMember .ID}}
 								{{if $isPublic}}
-									<strong>{{$.i18n.Tr "org.members.public"}}</strong>
-									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}}
+									<!-- <strong>{{$.i18n.Tr "org.members.public"}}</strong> -->
+									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} <a class="link-action"  href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a> {{end}}
 								{{else}}
-									<strong>{{$.i18n.Tr "org.members.private"}}</strong>
-									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}}
+									<!-- <strong>{{$.i18n.Tr "org.members.private"}}</strong> -->
+									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} <a class="link-action"   href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a> {{end}}
 								{{end}}
 							</div>
-						</div><div class="ui three wide column center">
-							<div class="meta">
-								{{$.i18n.Tr "org.members.member_role"}}
-							</div>
-							<div class="meta">
-								<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
-							</div>
-						</div><div class="ui one wide column center">
-							<div class="meta">
-								2FA
-							</div>
-							<div class="meta">
-								<strong>
-									{{if index $.MembersTwoFaStatus .ID}}
-										<span class="text green">{{svg "octicon-check" 16}}</span>
-									{{else}}
-										{{svg "octicon-x" 16}}
-									{{end}}
-								</strong>
+						</div>
+						
+						<div  style="padding-left: 0.8em;">
+							<div>
+								<a  href="{{.HomeLink}}" class="course_header"> {{.Name}}</a> 
+					
+								<div class="ui small label topic meb_label" >
+									{{if index $.MembersIsUserOrgOwner .ID}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}
+								</div>
 							</div>
-						</div><div class="ui three wide column">
-							<div class="text right">
-								{{if eq $.SignedUser.ID .ID}}
-									<form method="post" action="{{$.OrgLink}}/members/action/leave">
-										{{$.CsrfTokenHtml}}
-										<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.leave"}}</button>
-									</form>
-								{{else if $.IsOrganizationOwner}}
-									<form method="post" action="{{$.OrgLink}}/members/action/remove">
-										{{$.CsrfTokenHtml}}
-										<button type="submit" class="ui red small button" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.members.remove"}}</button>
-									</form>
-								{{end}}
+		
+							<div class="meta" style="margin-top: 0.5em;">
+								{{.FullName}}
 							</div>
-						</div>
-					</div>
-				{{end}}
-			</div>
 
-			<!-- <div class="ui three cards" style="margin-bottom: 10px;">
-				{{ range .Members}}
-				
-					<div class="card" >
-						<div class="image">
-							<img src="/images/avatar2/large/kristy.png">
-						  </div>
-						  <div class="content">
-							<a class="header">Kristy</a>
-							<div class="meta">
-							  <span class="date">Joined in 2013</span>
-							</div>
-							<div class="description">
-							  Kristy is an art director living in New York.
+							<div class="meta" style="margin-top: 0.5em;">
+								{{svg "octicon-mail" 16}}
+								<a  class="cor" href="mailto:{{.Email}}" rel="nofollow"> {{.Email}}</a>
 							</div>
+							
+						</div>
+						<div class="button_leaveOrg" style="display:none" >
+							{{if eq $.SignedUser.ID .ID}}
+								<form method="post" action="{{$.OrgLink}}/members/action/leave">
+									{{$.CsrfTokenHtml}}
+									<button type="submit" class="ui red basic button bt_mr" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.course_members.leave"}}</button>
+								</form>
+							{{else if $.IsOrganizationOwner}}
+								<form method="post" action="{{$.OrgLink}}/members/action/remove">
+									{{$.CsrfTokenHtml}}
+									<button type="submit" class="ui red basic  button bt_mr" name="uid" value="{{.ID}}">{{$.i18n.Tr "org.course_members.remove"}}</button>
+								</form>
+							{{end}}
 						</div>
 					</div>
+					
 				{{end}}
-
-			</div> -->
+					
+			</div>
+		</div>
 			
 			{{template "base/paginate" .}}
 		</div>
@@ -102,3 +117,14 @@
 	</div>
 </div>
 {{template "base/footer" .}}
+
+<script>
+	function show_bt(bt_id){
+		console.log(bt_id)
+		document.getElementById(""+bt_id).getElementsByClassName("button_leaveOrg")[0].style.display="inline-block";
+	
+	}
+	function hide_bt(bt_id){
+		document.getElementById(""+bt_id).getElementsByClassName("button_leaveOrg")[0].style.display="none";
+	}
+</script>
\ No newline at end of file
diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl
index 456ec1365c..98f61ca6ef 100644
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -73,7 +73,7 @@
 						</span>
 					</td>
 				{{else}}
-					<td class="name thirteen wide">
+					<td class="name four wide">
 						<span class="truncate">
 							{{if $entry.IsDir}}
 								{{$subJumpablePathName := $entry.GetSubJumpablePathName}}
@@ -94,12 +94,12 @@
 					</td>
 				{{end}}
 				
-				<!-- <td class="message nine wide">
+				<td class="message nine wide">
 					<span class="truncate">
 						<a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary | RenderEmoji}}</a>
 					</span>
-				</td> -->
-				<td class="text right age one wide" style="text-align: right;">{{TimeSince $commit.Committer.When $.Lang}}</td>
+				</td>
+				<td class="text right age three wide">{{TimeSince $commit.Committer.When $.Lang}}</td>
 			</tr>
 		{{end}}
 	</tbody>
-- 
2.34.1


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 30/63] =?UTF-8?q?=E5=85=B3=E9=94=AE=E5=AD=97=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E4=B8=B2=E4=B8=8D=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=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 70ea9b4211..e5ab51aa77 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){
-- 
2.34.1


From 76a1e6f7a325be1d160326ca336168f3e14faf4a Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 20 Jan 2022 15:01:36 +0800
Subject: [PATCH 31/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/org/course_list.tmpl  | 2 +-
 templates/org/home_courses.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 6313ad0102..855550261d 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -128,7 +128,7 @@
                         <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
                         <div class="left aligned author">
                         <!-- <span > -->
-                            {{if ne .CreatorID 0}}
+                            {{if .Creator}}
                                 <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}">
                             {{else}}
                                 <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}">
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index e5ab51aa77..be85005c32 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -169,7 +169,7 @@
                                             <div class="content"  style="margin-left: 10px;">
                                                 <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
-												    {{if ne .CreatorID 0}}
+												    {{if .Creator}}
                                                     	贡献者：{{.Creator.Name}}
 													{{else}}
 														贡献者：{{.Owner.Name}}
-- 
2.34.1


From b9906ca8cd11879bd90de04c767e782936827119 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 20 Jan 2022 15:49:06 +0800
Subject: [PATCH 32/63] fix issue

---
 options/locale/locale_en-US.ini |  4 ++++
 options/locale/locale_zh-CN.ini |  3 +++
 templates/repo/courseHome.tmpl  | 11 ++++++-----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0d5c1db14b..6c14d769f5 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -873,6 +873,10 @@ get_repo_info_error=Can not get the information of the repository.
 generate_statistic_file_error=Fail to generate file.
 repo_stat_inspect=ProjectAnalysis
 all=All
+
+computing.all = All
+computing.Introduction=Introduction
+
 modelarts.status=Status
 modelarts.createtime=CreateTime
 modelarts.version_nums = Version Nums
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index aefe62b952..63719130f2 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -881,6 +881,9 @@ generate_statistic_file_error=生成文件失败。
 repo_stat_inspect=项目分析
 all=所有
 
+computing.all=全部
+computing.Introduction=简介
+
 modelarts.status=状态
 modelarts.createtime=创建时间
 modelarts.version_nums=版本数
diff --git a/templates/repo/courseHome.tmpl b/templates/repo/courseHome.tmpl
index 3f2cbe01af..7629fc1c6f 100644
--- a/templates/repo/courseHome.tmpl
+++ b/templates/repo/courseHome.tmpl
@@ -105,7 +105,7 @@
 			</div>
 		{{end}}
         <div>
-            <span>简介：</span>
+            <span>{{.i18n.Tr "repo.computing.Introduction"}}：</span>
             {{if .Repository.DescriptionHTML}}
                 <span class="description" style="color: #8a8e99;">{{.Repository.DescriptionHTML}}</span>
             {{else}}
@@ -121,7 +121,8 @@
                 
             </div>
             <a style="margin-left: 0.5rem;" id="manage_topic">
-                {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<i  style="cursor: pointer;" class="plus square outline icon"></i>{{end}}添加标签
+                {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<i  style="cursor: pointer;" class="plus square outline icon"></i>{{end}}
+                {{.i18n.Tr "repo.issues.new.add_labels_title"}}
             </a>
                 
             <div id="topic_edit" class="vue_menu" style="display:none;">
@@ -272,12 +273,12 @@
 						<h4 class="ui header" style="border-bottom: 1px solid rgba(225, 227, 230, 100);padding: 0.5rem 0;">
 							{{$lenCon := len .ContributorInfo}}
 							{{if lt $lenCon 25 }}
-							<strong>贡献者 ({{len .ContributorInfo}})</strong>
+							<strong>{{.i18n.Tr "home.contributors"}} ({{len .ContributorInfo}})</strong>
 							{{else}}
-							<strong>贡献者 ({{len .ContributorInfo}}+)</strong>
+							<strong>{{.i18n.Tr "home.contributors"}} ({{len .ContributorInfo}}+)</strong>
 							{{end}}
 							<div class="ui right">
-								<a class="membersmore text grey" href="{{.RepoLink}}/contributors?type={{if .IsViewBranch}}branch{{else}}tag{{end}}&name={{.BranchName}}">全部 {{svg "octicon-chevron-right" 16}}</a>
+								<a class="membersmore text grey" href="{{.RepoLink}}/contributors?type={{if .IsViewBranch}}branch{{else}}tag{{end}}&name={{.BranchName}}">{{.i18n.Tr "repo.computing.all"}} {{svg "octicon-chevron-right" 16}}</a>
 							</div>
 						</h4>
 						<div class="ui members" id="contributorInfo">
-- 
2.34.1


From de8f90e0aba2d78c538c502fab5d82f99aee6e4d Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Thu, 20 Jan 2022 16:39:48 +0800
Subject: [PATCH 33/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini          |  4 ++
 options/locale/locale_zh-CN.ini          |  5 ++
 templates/org/course_list.tmpl           | 70 ++++--------------------
 templates/org/home_courses.tmpl          | 14 +++--
 templates/org/member/course_members.tmpl |  4 +-
 5 files changed, 30 insertions(+), 67 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 0d5c1db14b..f5b82df4d7 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2053,6 +2053,10 @@ team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
 selected_couse=Selected course
+release_course = Contributors
+all_keywords=All keywords
+max_selectedPro= A maximum of nine items can be selected
+custom_select_courses = Custom selected courses
 
 form.name_reserved = The organization name '%s' is reserved.
 form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index aefe62b952..8dce06da18 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2066,6 +2066,10 @@ team_permission_desc=权限
 team_unit_desc=允许访问项目单元
 team_unit_disabled=(已禁用)
 selected_couse=精选课程
+release_course = 发布课程 
+all_keywords=所有关键字
+max_selectedPro= 最多可选9个公开项目
+custom_select_courses = 自定义精选课程
 
 form.name_reserved=组织名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=组织名称中不允许使用 "%s"。
@@ -2157,6 +2161,7 @@ teams.all_repositories_admin_permission_desc=该团队拥有 <strong>管理</str
 teams.join_teams=加入该组织
 
 
+
 [admin]
 dashboard=管理面板
 users=帐户管理
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 6313ad0102..156330ac3d 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -72,26 +72,19 @@
         /* margin-left: 0.5em; */
         font-size: 14px;
     }
+	.card{
+        box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60) !important;
+        border-radius: 5px;
+        border: 1px solid rgba(232, 232, 232, 100)    
+	}
 
 </style>
-<!-- <div class="ui stackable grid"> -->
-    <!-- <div style="width: 100%;margin:15px 0;">
-        {{if .tags}} 
-            <span class="header">
-                精选项目      
-            </span>
-            {{if .IsOrganizationOwner}}        
-                <a class="text-right" id="model" onclick="showcreate()" >{{svg "octicon-gear" 16}}自定义</a>
-            {{end}}
-        {{end}}
-        
-    </div> -->
 
     <div style="width: 100%;">
   
         <div class="ui three cards" style="margin-bottom: 10px;">
             {{range .Repos}}
-                <div class="card" >
+                <div class="card " >
                 
                     <div class="extra full_height cor"  >
                         <div class="content " >
@@ -112,26 +105,20 @@
                         
                         <div class='content descript_height nowrap-2'>
                             {{.Description}}
-                            <!-- <p class="time">
-                                {{$.i18n.Tr "org.repo_updated"}} {{TimeSinceUnix .UpdatedUnix $.i18n.Lang}}
-                                {{if .PrimaryLanguage }}
-                                <span class="text grey"><i class="color-icon" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{ .PrimaryLanguage.Language }}</span>
-                                {{end}}
-                            </p> -->
                         </div>
                         
                         
                                                         
                         
                     </div>
-                    <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;">                            
-                        <!-- <img class="ui avatar" style="width: 22px;height:22px;display:flex;vertical-align: middle;" src="{{.Creator.RelAvatarLink}}"> -->
+                    <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;margin-bottom: 15px;">                            
                         <div class="left aligned author">
                         <!-- <span > -->
-                            {{if ne .CreatorID 0}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Creator.RelAvatarLink}}">
+                           
+                            {{if  .Creator }}
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px"  src="{{.Creator.RelAvatarLink}}">
                             {{else}}
-                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-2px"  src="{{.Owner.RelAvatarLink}}">
+                                <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px"  src="{{.Owner.RelAvatarLink}}">
                             {{end}}
 
                             {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
@@ -144,39 +131,6 @@
                     
     </div>
 
-<!-- </div> -->
-
-<!-- <div class="ui modal">
-    <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
-        <h4 id="model_header">自定义精选课程</h4>
-    </div>
-    <div class="content content-padding" style="color: black;">
-        <p>最多可选9个公开项目</p>
-        <div class="ui search" >
-            <div class="ui input" style="width: 100%;">
-                <input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
-            </div>
-        </div>
-        <div style="margin: 10px ;">
-            <div id ='org_list' style="margin-bottom: 20px;"class="content_list" >
-
-            </div>     
-        </div>
-        <p id='recommend'></p>
-       
-        <div class="inline field" style="margin-left: 37%;">
-            <div class="actions">
-                <button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
-                    {{.i18n.Tr "explore.save"}}
-                </button>
-                <button class="ui button cancel" >{{.i18n.Tr "explore.cancel"}}</button>
-            </div>
-        </div> 
-         
-    </div>
-
-</div> -->
-
 <script>
     var data;
     var filterData=[];
@@ -233,7 +187,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));
         })
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index e5ab51aa77..a3bd011e9f 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -79,6 +79,7 @@
 	.noborder{
 		border: none !important;
 	}
+
 </style>
 {{template "base/head" .}}
 <div class="organization profile">
@@ -128,7 +129,7 @@
 					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
 						<!-- {{if .CanCreateOrgRepo}} -->
 							<div class="text center" style="margin-left: 10px;">
-								<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;发布课程 </a>
+								<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
 							</div>
 						<!-- {{end}} -->
 					</div>
@@ -158,7 +159,7 @@
                
 						<div class="ui attached table segment course items noborder">
                             {{ range .tags}}
-                                {{if eq .TagName "精选项目"}}
+                                {{if eq .TagName "精选项目"}} 
                                
                                     {{range $i, $v := .RepoList}}
                                         {{if gt $i 0}}
@@ -170,9 +171,9 @@
                                                 <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
                                                 <p class="text grey">
 												    {{if ne .CreatorID 0}}
-                                                    	贡献者：{{.Creator.Name}}
+														{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
 													{{else}}
-														贡献者：{{.Owner.Name}}
+													{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
 													{{end}}
                                                 </p>
                                             </div>
@@ -269,6 +270,7 @@
 
 {{template "base/footer" .}}
 <script>
+
     var data;
     var filterData=[];
     var num=0;
@@ -428,11 +430,11 @@
             success:function(json){
                 data = json;
                 if(data.code==0){
-                    alert("加入成功")
+                    alert("Join  success")
                     location.reload()  
 
                 }else{
-                    alert("加入失败")
+                    alert("Join failure")
                 } 
             }
         });
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index fbcaef2e6f..40f933e32c 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -59,14 +59,12 @@
 					<div  class="card_course" style="position: relative;" id = "{{.ID}}" onmouseover ="show_bt( {{.ID}}  )" onmouseout="hide_bt({{.ID}})">
 						<div >
 							<img class="ui avatar " style="width: 45px;height:45px;margin-top: 2px;" src="{{.SizedRelAvatarLink 48}}">
-							<!-- <a style="display: block;font-size: 12px;text-align: center;margin-top: 0.5em;">显示</a> -->
+							
 							<div class="meta" style="text-align: center; margin-top: 0.5em;">
 								{{ $isPublic := index $.MembersIsPublicMember .ID}}
 								{{if $isPublic}}
-									<!-- <strong>{{$.i18n.Tr "org.members.public"}}</strong> -->
 									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} <a class="link-action"  href data-url="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a> {{end}}
 								{{else}}
-									<!-- <strong>{{$.i18n.Tr "org.members.private"}}</strong> -->
 									{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}} <a class="link-action"   href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a> {{end}}
 								{{end}}
 							</div>
-- 
2.34.1


From 7c3d70a6546b8623dfef3c0a3d32af93b1d9cf0a Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Thu, 20 Jan 2022 16:45:18 +0800
Subject: [PATCH 34/63] =?UTF-8?q?=E7=B2=BE=E5=93=81=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=AF=BE=E7=A8=8B=E5=90=8D=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/repository/repository.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/repository/repository.go b/services/repository/repository.go
index f43a3c62df..cea16516ae 100644
--- a/services/repository/repository.go
+++ b/services/repository/repository.go
@@ -122,7 +122,7 @@ func GetRecommendRepoFromPromote(filename string) ([]map[string]interface{}, err
 		} else {
 			ownerName := strings.Trim(repoName[0:tmpIndex], " ")
 			repoName := strings.Trim(repoName[tmpIndex+1:], " ")
-			repo, err := models.GetRepositoryByOwnerAndName(ownerName, repoName)
+			repo, err := models.GetRepositoryByOwnerAndAlias(ownerName, repoName)
 			if err == nil {
 				repoMap := make(map[string]interface{})
 				repoMap["ID"] = fmt.Sprint(repo.ID)
-- 
2.34.1


From 99f9304588c0809d03f46a2de9a418666cbec9dc Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Thu, 20 Jan 2022 17:20:04 +0800
Subject: [PATCH 35/63] fix issue

---
 templates/org/home_courses.tmpl | 840 ++++++++++++++++----------------
 1 file changed, 419 insertions(+), 421 deletions(-)

diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 33d6efd2da..3100ffcc7f 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -1,444 +1,442 @@
 <style>
 
-	.organization-info_1000{
-		background: #F5F5F6 !important;
-		padding-top: 30px;
-		margin-bottom: 0px !important;
-	}
-	.organization-info >.container {
-		overflow: auto;
-		background: #f5f5f6 !important;
-		padding-top: 30px;
-		padding-bottom: 20px;
-		background-size: cover;
-		border-radius: 5px;
-		border: none !important
-	}
-
-	.organization.profile #org-avatar {
-		border:none !important
-	}
-	.desc {
-		font-size: 14px;
-		margin-bottom: 10px !important;
-    }
-	.item {
-		display: inline-block;
-		margin-right: 10px;
-    }
-	.item .icon {
-      	margin-right: 5px;
-    }
-	.organization-info >.container {
-		padding-bottom:0px !important;
-	}
-	.tag_bg{
-		background-color: #0366D6 !important;
-		color:#FFFFFF !important;
-	}
-	.course{
-		padding:10px 0 15px !important;
-	}
-	.course_color{
-		color: #FA8C16;
-	}
-	.tag_lable{
-		border: 1px solid rgba(232, 232, 232, 100) ;
-		border-radius: 4px;
-		color: rgba(65, 80, 88, 100);
-		font-family: Microsoft Yahei;
-		font-size: 14px;
-		padding: 0.3em 0.5em;
-		height: 30px;
-		text-align: center;
-		margin: 0.2em;
-	}
-	.tag_lable_first{
-		border: 1px solid rgba(232, 232, 232, 100) ;
-		border-radius: 4px;
-		color: rgba(65, 80, 88, 100);
-		font-family: Microsoft Yahei;
-		font-size: 14px;
-		padding: 0.3em 0.5em;
-		height: 30px;
-		text-align: center;
-		margin: 0.2em;
-		margin-left: none;
-	}
-	.tag_key{
-		max-width:100%;
-		margin: 3px 3px;
-		display:inline-flex;
-	}
-   .bpadding{
-		padding:10px 40px
-   }
-   .omit{
-        overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
-    }
-	.noborder{
-		border: none !important;
-	}
-
-</style>
-{{template "base/head" .}}
-<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 organization-info_1000">
-		<div class="ui center aligned container " style="overflow: auto">
-			<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
-			<div class="content"  style="text-align: left;margin-left:100px" >
-				<div class="ui header" >
-					{{.Org.DisplayName}}
-				</div>
-				<div class="description" >
-					{{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}}
-				</div>
-				
-				<div class="meta" style="display: inline-flex;">
-					{{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>
-	{{template "org/navber_course" .}}
-
-	<div class="ui container">
-
-		<!-- 新增 -->
-		<div class="ui stackable grid">	
-		
-			<div class="ui sixteen wide computer column">
-				<div class="ui mobile reversed stackable grid">
-					<div class="ui ten wide tablet eleven wide computer column" id='tag'>
+		.organization-info_1000{
+			background: #F5F5F6 !important;
+			padding-top: 30px;
+			margin-bottom: 0px !important;
+		}
+		.organization-info >.container {
+			overflow: auto;
+			background: #f5f5f6 !important;
+			padding-top: 30px;
+			padding-bottom: 20px;
+			background-size: cover;
+			border-radius: 5px;
+			border: none !important
+		}
 	
-						<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?"  >全部关键字</span></a>
-
-                        {{range .CoursesKeywords}}
-							{{if ne . ""}}
-								<a  class="{{if eq $.Keyword . }} tag_bg {{end}} tag_key ui small tag_lable topic omit" href="{{$.Link}}?q={{.}}" >
-									{{.}}
-								</a>
-							{{end}}
-                        {{end}}
+		.organization.profile #org-avatar {
+			border:none !important
+		}
+		.desc {
+			font-size: 14px;
+			margin-bottom: 10px !important;
+		}
+		.item {
+			display: inline-block;
+			margin-right: 10px;
+		}
+		.item .icon {
+			  margin-right: 5px;
+		}
+		.organization-info >.container {
+			padding-bottom:0px !important;
+		}
+		.tag_bg{
+			background-color: #0366D6 !important;
+			color:#FFFFFF !important;
+		}
+		.course{
+			padding:10px 0 15px !important;
+		}
+		.course_color{
+			color: #FA8C16;
+		}
+		.tag_lable{
+			border: 1px solid rgba(232, 232, 232, 100) ;
+			border-radius: 4px;
+			color: rgba(65, 80, 88, 100);
+			font-family: Microsoft Yahei;
+			font-size: 14px;
+			padding: 0.3em 0.5em;
+			height: 30px;
+			text-align: center;
+			margin: 0.2em;
+		}
+		.tag_lable_first{
+			border: 1px solid rgba(232, 232, 232, 100) ;
+			border-radius: 4px;
+			color: rgba(65, 80, 88, 100);
+			font-family: Microsoft Yahei;
+			font-size: 14px;
+			padding: 0.3em 0.5em;
+			height: 30px;
+			text-align: center;
+			margin: 0.2em;
+			margin-left: none;
+		}
+		.tag_key{
+			max-width:100%;
+			margin: 3px 3px;
+			display:inline-flex;
+		}
+	   .bpadding{
+			padding:10px 40px
+	   }
+	   .omit{
+			overflow: hidden; white-space: nowrap; text-overflow: ellipsis;
+		}
+		.noborder{
+			border: none !important;
+		}
+	
+	</style>
+	{{template "base/head" .}}
+	<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 organization-info_1000">
+			<div class="ui center aligned container " style="overflow: auto">
+				<img class="ui left  image" id="org-avatar" src="{{.Org.SizedRelAvatarLink 140}}"/>
+				<div class="content"  style="text-align: left;margin-left:100px" >
+					<div class="ui header" >
+						{{.Org.DisplayName}}
 					</div>
-				
-					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
-						<!-- {{if .CanCreateOrgRepo}} -->
-							<div class="text center" style="margin-left: 10px;">
-								<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
-							</div>
-						<!-- {{end}} -->
+					<div class="description" >
+						{{if .Org.Description}}<p class="text grey desc">{{.Org.Description}}</p>{{end}}
+					</div>
+					
+					<div class="meta" style="display: inline-flex;">
+						{{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>
-
-		<!-- 全部 -->
-
-		<div class="ui stackable grid">	
+		{{template "org/navber_course" .}}
+	
+		<div class="ui container">
+	
+			<!-- 新增 -->
+			<div class="ui stackable grid">	
+			
+				<div class="ui sixteen wide computer column">
+					<div class="ui mobile reversed stackable grid">
+						<div class="ui ten wide tablet eleven wide computer column" id='tag'>
 		
-			<div class="ui sixteen wide computer column">
-				<div class="ui mobile reversed stackable grid">
-					<div class="ui ten wide tablet eleven wide computer column">
-						{{template "org/course_list" .}}
-						{{template "base/paginate" .}}
-					</div>
-
-					<div class="ui sixteen wide mobile six wide tablet five wide computer column">
-
-						<h4 class="ui top attached header noborder">
-							<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
-							<div class="ui right">
-								<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
-							</div>
-						</h4>
-               
-						<div class="ui attached table segment course items noborder">
-                            {{ range .tags}}
-                                {{if eq .TagName "精选项目"}} 
-                               
-                                    {{range $i, $v := .RepoList}}
-                                        {{if gt $i 0}}
-                                            <div class="ui divider" style="margin-bottom:10px;"></div>
-                                        {{end}}
-                                        <div class="item">
-                                            <i class="ri-bookmark-3-line course_color" ></i>
-                                            <div class="content"  style="margin-left: 10px;">
-                                                <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
-                                                <p class="text grey">
-												    {{if ne .CreatorID 0}}
-														{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
-												    {{if .Creator}}
-                                                    	{{$.i18n.Tr "home.contributors"}} {{.Creator.Name}}
-													{{else}}
-													{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
-													{{end}}
-                                                </p>
-                                            </div>
-                                        </div>
-
-                                    {{end}}
-                                {{end}}
-                            {{end}}
-						
-						</div>
-
-						
-						<h4 class="ui top attached header noborder">
-							<strong>{{.i18n.Tr "org.people"}}</strong>
-							<div class="ui right">
-								<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
-							</div>
-						</h4>
-						<div class="ui attached segment members noborder">
-							{{$isMember := .IsOrganizationMember}}
-							{{range .Members}}
-								{{if or $isMember (.IsPublicMember $.Org.ID)}}
-									<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.RelAvatarLink}}"></a>
+							<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?"  >全部关键字</span></a>
+	
+							{{range .CoursesKeywords}}
+								{{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 style="text-align: center;margin-top: 5px;"> 
-                                <a class="ui blue basic button" onclick="jion_course_team()"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
-                            </div>
 						</div>
-
-						{{if .IsOrganizationMember}}
-							<div class="ui top attached header noborder">
-								<strong>{{.i18n.Tr "org.teams"}}</strong>
+					
+						<div class="ui sixteen wide mobile six wide tablet five wide computer column">
+							<!-- {{if .CanCreateOrgRepo}} -->
+								<div class="text center" style="margin-left: 10px;">
+									<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
+								</div>
+							<!-- {{end}} -->
+						</div>
+					</div>
+				</div>
+			</div>
+	
+			<!-- 全部 -->
+	
+			<div class="ui stackable grid">	
+			
+				<div class="ui sixteen wide computer column">
+					<div class="ui mobile reversed stackable grid">
+						<div class="ui ten wide tablet eleven wide computer column">
+							{{template "org/course_list" .}}
+							{{template "base/paginate" .}}
+						</div>
+	
+						<div class="ui sixteen wide mobile six wide tablet five wide computer column">
+	
+							<h4 class="ui top attached header noborder">
+								<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
 								<div class="ui right">
-									<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
+									<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
 								</div>
+							</h4>
+				   
+							<div class="ui attached table segment course items noborder">
+								{{ range .tags}}
+									{{if eq .TagName "精选项目"}} 
+								   
+										{{range $i, $v := .RepoList}}
+											{{if gt $i 0}}
+												<div class="ui divider" style="margin-bottom:10px;"></div>
+											{{end}}
+											<div class="item">
+												<i class="ri-bookmark-3-line course_color" ></i>
+												<div class="content"  style="margin-left: 10px;">
+													<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
+													<p class="text grey">
+														{{if ne .CreatorID 0}}
+															{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
+														{{else}}
+														{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
+														{{end}}
+													</p>
+												</div>
+											</div>
+	
+										{{end}}
+									{{end}}
+								{{end}}
+							
 							</div>
-							<div class="ui attached table segment teams noborder">
-								{{range .Teams}}
-									<div class="item">
-										<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
-										<p class="text grey">
-											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
-											<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
-										</p>
-									</div>
+	
+							
+							<h4 class="ui top attached header noborder">
+								<strong>{{.i18n.Tr "org.people"}}</strong>
+								<div class="ui right">
+									<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
+								</div>
+							</h4>
+							<div class="ui attached segment members noborder">
+								{{$isMember := .IsOrganizationMember}}
+								{{range .Members}}
+									{{if or $isMember (.IsPublicMember $.Org.ID)}}
+										<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.RelAvatarLink}}"></a>
+									{{end}}
 								{{end}}
+	
+								<div style="text-align: center;margin-top: 5px;"> 
+									<a class="ui blue basic button" onclick="jion_course_team()"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+								</div>
 							</div>
-							{{if .IsOrganizationOwner}}
-								<div class="ui bottom attached segment noborder">
-									<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+	
+							{{if .IsOrganizationMember}}
+								<div class="ui top attached header noborder">
+									<strong>{{.i18n.Tr "org.teams"}}</strong>
+									<div class="ui right">
+										<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
+									</div>
+								</div>
+								<div class="ui attached table segment teams noborder">
+									{{range .Teams}}
+										<div class="item">
+											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
+											<p class="text grey">
+												<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
+												<a href="{{$.OrgLink}}/teams/{{.LowerName}}/repositories"><strong>{{.NumRepos}}</strong> {{$.i18n.Tr "org.lower_repositories"}}</a>
+											</p>
+										</div>
+									{{end}}
 								</div>
+								{{if .IsOrganizationOwner}}
+									<div class="ui bottom attached segment noborder">
+										<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+									</div>
+								{{end}}
 							{{end}}
-						{{end}}
+						</div>
 					</div>
 				</div>
+				
 			</div>
-			
 		</div>
 	</div>
-</div>
-
-<div class="ui modal">
-    <div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
-        <h4 id="model_header">自定义精选课程</h4>
-    </div>
-    <div class="content content-padding" style="color: black;">
-        <p>最多可选9个公开项目</p>
-        <div class="ui search" >
-            <div class="ui input" style="width: 100%;">
-                <input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
-            </div>
-        </div>
-        <div style="margin: 10px ;">
-            <div id ='org_list' style="margin-bottom: 20px;"class="content_list" >
-
-            </div>     
-        </div>
-        <p id='recommend'></p>
-       
-        <div class="inline field" style="margin-left: 37%;">
-            <div class="actions">
-                <button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
-                    {{.i18n.Tr "explore.save"}}
-                </button>
-                <button class="ui button cancel" >{{.i18n.Tr "explore.cancel"}}</button>
-            </div>
-        </div> 
-         
-    </div>
-
-</div>
-
-{{template "base/footer" .}}
-<script>
-
-    var data;
-    var filterData=[];
-    var num=0;
-
-    function showcreate(obj){
-        document.getElementById("search_selectPro").value=''
-        $('.ui.modal')
-        .modal({
-            centered: false,
-            onShow:function(){
-                $("#org_list").empty()                
-                getPro(1)
-                
-            },
-            onHide:function(){
-  
-            }
-        })
-        .modal('show')
-    }
-    function getPro(typeTag){
-
-        $.ajax({
-            type:"GET",
-            url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
-            dataType:"json",
-            async:false,
-            success:function(json){
-                data = json.data;
-                var n_length = data.length
-                pro_html = getHTML(data)
-                $("#org_list").append(pro_html)
-                // console.log('原始',data)
-                checkedNum(0)
-            }
-        });
-    }
-    function getHTML(data){
-        let pro_html=''
-        for (let i=0;i<data.length;i++){
-            if (data[i].Selected==true){
-                console.log("data[i]:",data[i])
-                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = " ${i}" checked="" onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}"  data-selected=${data[i].Selected} > <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName}</label></div>`
-                pro_html += '</div>'
-            }
-            else{
-                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = "${i}"  onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}" data-selected= ${data[i].Selected}> <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName} </label></div>`
-                pro_html += '</div>'
-            }
-        }
-        return pro_html
-    }
-    function saveSeletedPro(typeTag){
-        var saveData=[];
-        $('input[name="select_pro_name"]:checked').each(function(){
-            // console.log('值',this.dataset.repoid)
-
-            saveData.push(parseInt(this.dataset.repoid));
-        })
-        if(saveData.length>9){
-            alert("最多可选9个，保存失败")
-            return
-        }
-
-        $.ajax({
-         type:"POST",
-         url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
-         contentType:'application/json',
-         dataType:"json",
-         async:false,
-         data:JSON.stringify({'repoList':saveData
-               }),        
-           success:function(res){
-            //  console.log('保存成功');
-             location.reload()  
-
-          }
-         });
-    }
-
-    function getSelecteData(){
-        var selectedData=[];
-        $('input[name="select_pro_name"]:checked').each(function(){
-            // console.log(this)
-            // console.log('值',this.dataset.selected)
-
-            selectedData.push({"RepoID":parseInt(this.dataset.repoid),"RepoName":this.dataset.reponame,"Selected":JSON.parse(this.dataset.selected)});
-        })
-        return selectedData
-    }
-    function search(){
-        var selectedData = getSelecteData();
-        var searchValue = document.getElementById("search_selectPro").value;
-        filterData=[];
-        console.log("searchValue:",searchValue)
-        for (let i=0;i<data.length;i++){
-            var isInclude=false; 
-            if(data[i].RepoName.toLowerCase().includes(searchValue.toLowerCase())){
-                filterData.push(data[i])
-            }
-        }
-        // 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)
-        $("#org_list").empty()
-        if(searchValue!=""){
-            if (filterData.length!=0){
-                
-                var pro_html = getHTML(selectedData);
-                console.log("selectedData_pro_html:",pro_html)
-                $("#org_list").append(pro_html)
-                pro_html= getHTML(filterData);
-                $("#org_list").append(pro_html)
-            }else{
-                var pro_html = getHTML(selectedData);
-                $("#org_list").append(pro_html)
-            }
-        }else{
-            var pro_html = getHTML(data);
-            $("#org_list").append(pro_html)
-        }
-    }
-
-    function checkedNum(id){
-
-        num=0;
-        var inputs = document.getElementsByName("select_pro_name")
-        for (var i=0;i<inputs.length;i++){
-            if(inputs[i].checked){
-                num++
-                if(num>9){
-                    document.getElementById(id).checked=false
-                    alert("选择超过9个，请重新选择！")
-                    
-                    return
-                }
-            }
-                
-        }
-
-        var show_num = 9-num;
-        document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
-
-    }
-    function jion_course_team(){
-        $.ajax({
-            type:"GET",
-            url:"/course/addOrg",
-            dataType:"json",
-            async:false,
-            success:function(json){
-                data = json;
-                if(data.code==0){
-                    alert("Join  success")
-                    location.reload()  
-
-                }else{
-                    alert("Join failure")
-                } 
-            }
-        });
-    }
-</script>
\ No newline at end of file
+	
+	<div class="ui modal">
+		<div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
+			<h4 id="model_header">自定义精选课程</h4>
+		</div>
+		<div class="content content-padding" style="color: black;">
+			<p>最多可选9个公开项目</p>
+			<div class="ui search" >
+				<div class="ui input" style="width: 100%;">
+					<input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
+				</div>
+			</div>
+			<div style="margin: 10px ;">
+				<div id ='org_list' style="margin-bottom: 20px;"class="content_list" >
+	
+				</div>     
+			</div>
+			<p id='recommend'></p>
+		   
+			<div class="inline field" style="margin-left: 37%;">
+				<div class="actions">
+					<button id="submitId" type="button" class="ui create_train_job green deny button"  onclick="saveSeletedPro(1)">
+						{{.i18n.Tr "explore.save"}}
+					</button>
+					<button class="ui button cancel" >{{.i18n.Tr "explore.cancel"}}</button>
+				</div>
+			</div> 
+			 
+		</div>
+	
+	</div>
+	
+	{{template "base/footer" .}}
+	<script>
+	
+		var data;
+		var filterData=[];
+		var num=0;
+	
+		function showcreate(obj){
+			document.getElementById("search_selectPro").value=''
+			$('.ui.modal')
+			.modal({
+				centered: false,
+				onShow:function(){
+					$("#org_list").empty()                
+					getPro(1)
+					
+				},
+				onHide:function(){
+	  
+				}
+			})
+			.modal('show')
+		}
+		function getPro(typeTag){
+	
+			$.ajax({
+				type:"GET",
+				url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
+				dataType:"json",
+				async:false,
+				success:function(json){
+					data = json.data;
+					var n_length = data.length
+					pro_html = getHTML(data)
+					$("#org_list").append(pro_html)
+					// console.log('原始',data)
+					checkedNum(0)
+				}
+			});
+		}
+		function getHTML(data){
+			let pro_html=''
+			for (let i=0;i<data.length;i++){
+				if (data[i].Selected==true){
+					console.log("data[i]:",data[i])
+					pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = " ${i}" checked="" onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}"  data-selected=${data[i].Selected} > <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName}</label></div>`
+					pro_html += '</div>'
+				}
+				else{
+					pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = "${i}"  onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}" data-selected= ${data[i].Selected}> <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName} </label></div>`
+					pro_html += '</div>'
+				}
+			}
+			return pro_html
+		}
+		function saveSeletedPro(typeTag){
+			var saveData=[];
+			$('input[name="select_pro_name"]:checked').each(function(){
+				// console.log('值',this.dataset.repoid)
+	
+				saveData.push(parseInt(this.dataset.repoid));
+			})
+			if(saveData.length>9){
+				alert("最多可选9个，保存失败")
+				return
+			}
+	
+			$.ajax({
+			 type:"POST",
+			 url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
+			 contentType:'application/json',
+			 dataType:"json",
+			 async:false,
+			 data:JSON.stringify({'repoList':saveData
+				   }),        
+			   success:function(res){
+				//  console.log('保存成功');
+				 location.reload()  
+	
+			  }
+			 });
+		}
+	
+		function getSelecteData(){
+			var selectedData=[];
+			$('input[name="select_pro_name"]:checked').each(function(){
+				// console.log(this)
+				// console.log('值',this.dataset.selected)
+	
+				selectedData.push({"RepoID":parseInt(this.dataset.repoid),"RepoName":this.dataset.reponame,"Selected":JSON.parse(this.dataset.selected)});
+			})
+			return selectedData
+		}
+		function search(){
+			var selectedData = getSelecteData();
+			var searchValue = document.getElementById("search_selectPro").value;
+			filterData=[];
+			console.log("searchValue:",searchValue)
+			for (let i=0;i<data.length;i++){
+				var isInclude=false; 
+				if(data[i].RepoName.toLowerCase().includes(searchValue.toLowerCase())){
+					filterData.push(data[i])
+				}
+			}
+			// 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)
+			$("#org_list").empty()
+			if(searchValue!=""){
+				if (filterData.length!=0){
+					
+					var pro_html = getHTML(selectedData);
+					console.log("selectedData_pro_html:",pro_html)
+					$("#org_list").append(pro_html)
+					pro_html= getHTML(filterData);
+					$("#org_list").append(pro_html)
+				}else{
+					var pro_html = getHTML(selectedData);
+					$("#org_list").append(pro_html)
+				}
+			}else{
+				var pro_html = getHTML(data);
+				$("#org_list").append(pro_html)
+			}
+		}
+	
+		function checkedNum(id){
+	
+			num=0;
+			var inputs = document.getElementsByName("select_pro_name")
+			for (var i=0;i<inputs.length;i++){
+				if(inputs[i].checked){
+					num++
+					if(num>9){
+						document.getElementById(id).checked=false
+						alert("选择超过9个，请重新选择！")
+						
+						return
+					}
+				}
+					
+			}
+	
+			var show_num = 9-num;
+			document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
+	
+		}
+		function jion_course_team(){
+			$.ajax({
+				type:"GET",
+				url:"/course/addOrg",
+				dataType:"json",
+				async:false,
+				success:function(json){
+					data = json;
+					if(data.code==0){
+						alert("Join  success")
+						location.reload()  
+	
+					}else{
+						alert("Join failure")
+					} 
+				}
+			});
+		}
+	</script>
\ No newline at end of file
-- 
2.34.1


From ea8ed506745bcfe1a32819ed69a135130601a540 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Thu, 20 Jan 2022 17:28:55 +0800
Subject: [PATCH 36/63] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=20=E5=85=A8=E9=83=A8=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_zh-CN.ini  | 2 +-
 templates/org/course_list.tmpl   | 4 ++--
 templates/org/home_courses.tmpl  | 2 +-
 templates/org/navber_course.tmpl | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 44c275c64f..ed83590aff 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2070,7 +2070,7 @@ team_unit_desc=允许访问项目单元
 team_unit_disabled=(已禁用)
 selected_couse=精选课程
 release_course = 发布课程 
-all_keywords=所有关键字
+all_keywords=全部关键字
 max_selectedPro= 最多可选9个公开项目
 custom_select_courses = 自定义精选课程
 
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 156330ac3d..4c85c14bb3 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -234,8 +234,8 @@
                 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)=>{
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 3100ffcc7f..9046a9c837 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -115,7 +115,7 @@
 					<div class="ui mobile reversed stackable grid">
 						<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>
+							<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?" >{{$.i18n.Tr "org.all_keywords"}}</span></a>
 	
 							{{range .CoursesKeywords}}
 								{{if ne . ""}}
diff --git a/templates/org/navber_course.tmpl b/templates/org/navber_course.tmpl
index 4bd5084821..1905c2f022 100644
--- a/templates/org/navber_course.tmpl
+++ b/templates/org/navber_course.tmpl
@@ -21,7 +21,7 @@
                     {{svg "octicon-jersey" 16}}&nbsp;{{$.i18n.Tr "org.teams"}}
                 </a>
             {{end}}
-            {{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;组织设置</a>{{end}}
+            {{if .IsOrganizationOwner}}<a class="right text grey item" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16}} &nbsp;{{$.i18n.Tr "org.settings"}}</a>{{end}}
         </div>
 
     </div>
-- 
2.34.1


From 4780c0f3df9f7adb5de7bc0de03bb2dbbb692ab3 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 21 Jan 2022 10:06:31 +0800
Subject: [PATCH 37/63] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=B2=BE=E9=80=89=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini |  7 +++++--
 options/locale/locale_zh-CN.ini |  3 +++
 templates/org/home_courses.tmpl | 11 ++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ae60a540c1..99b382ed53 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2059,8 +2059,11 @@ team_unit_disabled = (Disabled)
 selected_couse=Selected course
 release_course = Contributors
 all_keywords=All keywords
-max_selectedPro= A maximum of nine items can be selected
-custom_select_courses = Custom selected courses
+max_selectedPro= Selected up to nine public projects
+custom_select_courses = Custom selected courses 
+recommend_remain_pro = Remain
+save_fail_tips = The upper limit is exceeded
+select_again = Select more than 9, please select again!
 
 form.name_reserved = The organization name '%s' is reserved.
 form.name_pattern_not_allowed = The pattern '%s' is not allowed in an organization name.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index ed83590aff..e942a17b96 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2073,6 +2073,9 @@ release_course = 发布课程
 all_keywords=全部关键字
 max_selectedPro= 最多可选9个公开项目
 custom_select_courses = 自定义精选课程
+recommend_remain_pro = 还能推荐
+save_fail_tips = 最多可选9个，保存失败
+select_again = 选择超过9个，请重新选择！
 
 form.name_reserved=组织名称 '%s' 是被保留的。
 form.name_pattern_not_allowed=组织名称中不允许使用 "%s"。
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 9046a9c837..d5bcfc7e5c 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -239,10 +239,10 @@
 	
 	<div class="ui modal">
 		<div class="header" style="padding: 1rem;background-color: rgba(240, 240, 240, 100);">
-			<h4 id="model_header">自定义精选课程</h4>
+			<h4 id="model_header">{{.i18n.Tr "org.custom_select_courses"}}</h4>
 		</div>
 		<div class="content content-padding" style="color: black;">
-			<p>最多可选9个公开项目</p>
+			<p>{{.i18n.Tr "org.max_selectedPro"}}</p>
 			<div class="ui search" >
 				<div class="ui input" style="width: 100%;">
 					<input  type="text" id = 'search_selectPro' placeholder="Search ..." value = '' oninput="search()">
@@ -331,7 +331,7 @@
 				saveData.push(parseInt(this.dataset.repoid));
 			})
 			if(saveData.length>9){
-				alert("最多可选9个，保存失败")
+				alert("{{.i18n.Tr "org.save_fail_tips"}}")
 				return
 			}
 	
@@ -409,7 +409,7 @@
 					num++
 					if(num>9){
 						document.getElementById(id).checked=false
-						alert("选择超过9个，请重新选择！")
+						alert( "{{.i18n.Tr "org.select_again"}}")
 						
 						return
 					}
@@ -418,7 +418,8 @@
 			}
 	
 			var show_num = 9-num;
-			document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
+            let rec = "{{.i18n.Tr "org.recommend_remain_pro"}}"
+			document.getElementById("recommend").innerHTML=rec +" : "+ show_num
 	
 		}
 		function jion_course_team(){
-- 
2.34.1


From 6a07cf48465c88ab9895622547db4d41d2255eb9 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 21 Jan 2022 11:23:29 +0800
Subject: [PATCH 38/63] =?UTF-8?q?=E5=8D=83=E6=A0=A1=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini          |   1 +
 options/locale/locale_zh-CN.ini          |   1 +
 templates/base/head_course.tmpl          | 209 +++++++++++++++++++++++
 templates/org/course_list.tmpl           |   2 +-
 templates/org/home_courses.tmpl          |   2 +-
 templates/org/member/course_members.tmpl |   2 +-
 templates/org/team/courseTeams.tmpl      |   2 +-
 7 files changed, 215 insertions(+), 4 deletions(-)
 create mode 100644 templates/base/head_course.tmpl

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 99b382ed53..40e64cb062 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2040,6 +2040,7 @@ org_full_name_holder = Organization Full Name
 org_name_helper = Organization names should be short and memorable.
 create_org = Create Organization
 repo_updated = Updated
+repo_released = Released
 home = Home
 people = People
 teams = Teams
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index e942a17b96..6887129966 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -2052,6 +2052,7 @@ org_full_name_holder=组织全名
 org_name_helper=组织名字应该简单明了。
 create_org=创建组织
 repo_updated=最后更新于
+repo_released=发布于
 home=组织主页
 people=组织成员
 teams=组织团队
diff --git a/templates/base/head_course.tmpl b/templates/base/head_course.tmpl
new file mode 100644
index 0000000000..3fff0b8d2b
--- /dev/null
+++ b/templates/base/head_course.tmpl
@@ -0,0 +1,209 @@
+<!DOCTYPE html>
+<html lang="{{.Language}}">
+<head data-suburl="{{AppSubUrl}}">
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta http-equiv="x-ua-compatible" content="ie=edge">
+	<title>{{if .Title}}{{.Title}} - {{end}} {{if .Repository.Name}}{{.Repository.Name}} - {{end}}{{AppName}}</title>
+	<link rel="manifest" href="{{AppSubUrl}}/manifest.json" crossorigin="use-credentials">
+	{{if UseServiceWorker}}
+	<script>
+		if ('serviceWorker' in navigator) {
+			navigator.serviceWorker.register('{{AppSubUrl}}/serviceworker.js').then(function(registration) {
+				// Registration was successful
+				console.info('ServiceWorker registration successful with scope: ', registration.scope);
+			}, function(err) {
+				// registration failed :(
+				console.info('ServiceWorker registration failed: ', err);
+			});
+		}
+	</script>
+	{{else}}
+	<script>
+		if ('serviceWorker' in navigator) {
+			navigator.serviceWorker.getRegistrations().then(function(registrations) {
+				registrations.forEach(function(registration) {
+					registration.unregister();
+					console.info('ServiceWorker unregistered');
+				});
+			});
+		}
+	</script>
+	{{end}}
+	<meta name="theme-color" content="{{ThemeColorMetaTag}}">
+	<meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}{{MetaAuthor}}{{end}}" />
+	<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}{{MetaDescription}}{{end}}" />
+	<meta name="keywords" content="{{MetaKeywords}}">
+	<meta name="referrer" content="no-referrer" />
+	<meta name="_csrf" content="{{.CsrfToken}}" />
+	{{if .IsSigned}}
+		<meta name="_uid" content="{{.SignedUser.ID}}" />
+	{{end}}
+	{{if .ContextUser}}
+		<meta name="_context_uid" content="{{.ContextUser.ID}}" />
+	{{end}}
+	{{if .SearchLimit}}
+		<meta name="_search_limit" content="{{.SearchLimit}}" />
+	{{end}}
+{{if .GoGetImport}}
+	<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">
+	<meta name="go-source" content="{{.GoGetImport}} _ {{.GoDocDirectory}} {{.GoDocFile}}">
+{{end}}
+	<script>
+	{{SafeJS `/*
+	@licstart  The following is the entire license notice for the
+        JavaScript code in this page.
+
+	Copyright (c) 2016 The Gitea Authors
+	Copyright (c) 2015 The Gogs Authors
+
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+
+	The above copyright notice and this permission notice shall be included in
+	all copies or substantial portions of the Software.
+
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+	THE SOFTWARE.
+	---
+	Licensing information for additional javascript libraries can be found at:
+	  {{StaticUrlPrefix}}/vendor/librejs.html
+
+	@licend  The above is the entire license notice
+        for the JavaScript code in this page.
+	*/`}}
+	</script>
+	<script>
+		window.config = {
+			AppSubUrl: '{{AppSubUrl}}',
+			StaticUrlPrefix: '{{StaticUrlPrefix}}',
+			csrf: '{{.CsrfToken}}',
+			HighlightJS: {{if .RequireHighlightJS}}true{{else}}false{{end}},
+			Minicolors: {{if .RequireMinicolors}}true{{else}}false{{end}},
+			SimpleMDE: {{if .RequireSimpleMDE}}true{{else}}false{{end}},
+			Tribute: {{if .RequireTribute}}true{{else}}false{{end}},
+			U2F: {{if .RequireU2F}}true{{else}}false{{end}},
+			Heatmap: {{if .EnableHeatmap}}true{{else}}false{{end}},
+			heatmapUser: {{if .HeatmapUser}}'{{.HeatmapUser}}'{{else}}null{{end}},
+			NotificationSettings: {
+				MinTimeout: {{NotificationSettings.MinTimeout}},
+				TimeoutStep:  {{NotificationSettings.TimeoutStep}},
+				MaxTimeout: {{NotificationSettings.MaxTimeout}},
+				EventSourceUpdateTime: {{NotificationSettings.EventSourceUpdateTime}},
+			},
+      {{if .RequireTribute}}
+			tributeValues: [
+				{{ range .Assignees }}
+				{key: '{{.Name}} {{.FullName}}', value: '{{.Name}}',
+				name: '{{.Name}}', fullname: '{{.FullName}}', avatar: '{{.RelAvatarLink}}'},
+				{{ end }}
+			],
+			{{end}}
+		};
+	</script>
+	<link rel="shortcut icon" href="{{StaticUrlPrefix}}/img/favicon.png">
+	<link rel="mask-icon" href="{{StaticUrlPrefix}}/img/openi-safari.svg" color="#609926">
+	<link rel="fluid-icon" href="{{StaticUrlPrefix}}/img/gitea-lg.png" title="{{AppName}}">
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/assets/font-awesome/css/font-awesome.min.css">
+	<link rel="preload" as="font" href="{{StaticUrlPrefix}}/fomantic/themes/default/assets/fonts/icons.woff2" type="font/woff2" crossorigin="anonymous">
+	<link rel="preload" as="font" href="{{StaticUrlPrefix}}/fomantic/themes/default/assets/fonts/outline-icons.woff2" type="font/woff2" crossorigin="anonymous">
+{{if .RequireSimpleMDE}}
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/simplemde/simplemde.min.css">
+{{end}}
+
+{{if .RequireTribute}}
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/tribute/tribute.css">
+{{end}}
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/fomantic/semantic.min.css?v={{MD5 AppVer}}">
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}">
+	<noscript>
+		<style>
+			.dropdown:hover > .menu { display: block; }
+			.ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
+		</style>
+	</noscript>
+{{if .RequireMinicolors}}
+	<link rel="stylesheet" href="{{StaticUrlPrefix}}/vendor/plugins/jquery.minicolors/jquery.minicolors.css">
+{{end}}
+	<style class="list-search-style"></style>
+{{if .PageIsUserProfile}}
+	<meta property="og:title" content="{{.Owner.Name}}" />
+	<meta property="og:type" content="profile" />
+	<meta property="og:image" content="{{.Owner.AvatarLink}}" />
+	<meta property="og:url" content="{{.Owner.HTMLURL}}" />
+	{{if .Owner.Description}}
+		<meta property="og:description" content="{{.Owner.Description}}">
+	{{end}}
+{{else if .Repository}}
+	{{if .Issue}}
+		<meta property="og:title" content="{{.Issue.Title}}" />
+		<meta property="og:url" content="{{.Issue.HTMLURL}}" />
+		{{if .Issue.Content}}
+			<meta property="og:description" content="{{.Issue.Content}}" />
+		{{end}}
+	{{else}}
+		<meta property="og:title" content="{{.Repository.Name}}" />
+		<meta property="og:url" content="{{.Repository.HTMLURL}}" />
+		{{if .Repository.Description}}
+			<meta property="og:description" content="{{.Repository.Description}}" />
+		{{end}}
+	{{end}}
+	<meta property="og:type" content="object" />
+	<meta property="og:image" content="{{.Repository.Owner.AvatarLink}}" />
+{{else}}
+	<meta property="og:title" content="{{AppName}}">
+	<meta property="og:type" content="website" />
+	<meta property="og:image" content="{{StaticUrlPrefix}}/img/gitea-lg.png" />
+	<meta property="og:url" content="{{AppUrl}}" />
+	<meta property="og:description" content="{{MetaDescription}}">
+{{end}}
+<meta property="og:site_name" content="{{AppName}}" />
+{{if .IsSigned }}
+	{{ if ne .SignedUser.Theme "gitea" }}
+		<link rel="stylesheet" href="{{StaticUrlPrefix}}/css/theme-{{.SignedUser.Theme}}.css?v={{MD5 AppVer}}">
+	{{end}}
+{{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>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?46149a0b61fdeddfe427ff4de63794ba";
+  var s = document.getElementsByTagName("script")[0]; 
+  s.parentNode.insertBefore(hm, s);
+})();
+</script>
+<script  src="/self/func.js" type="text/javascript"></script>
+</head>
+<body>
+	{{template "custom/body_outer_pre" .}}
+
+	<div class="full height">
+		<noscript>{{.i18n.Tr "enable_javascript"}}</noscript>
+
+		{{template "custom/body_inner_pre" .}}
+		
+		{{if not .PageIsInstall}}
+			<div class="ui top secondary stackable main menu following bar dark">
+				{{template "base/head_navbar" .}}
+			</div><!-- end bar -->
+		{{end}}
+{{/*
+	</div>
+</body>
+</html>
+*/}}
+
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 4c85c14bb3..1a046b79cf 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -121,7 +121,7 @@
                                 <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px"  src="{{.Owner.RelAvatarLink}}">
                             {{end}}
 
-                            {{$.i18n.Tr "org.repo_updated"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .UpdatedUnix}}
+                            {{$.i18n.Tr "org.repo_released"}}&nbsp;: &nbsp; {{TimeSinceUnixShort  .CreatedUnix}}
                         <!-- </span> -->
                         </div>
                     </div>
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index d5bcfc7e5c..401a3b5f0e 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -81,7 +81,7 @@
 		}
 	
 	</style>
-	{{template "base/head" .}}
+	{{template "base/head_course" .}}
 	<div class="organization profile">
 		{{/* overflow: auto is the clearfix - this avoids the image going beyond
 		the container where it is supposed to stay inside. */}}
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 40f933e32c..2c710ec2bc 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -44,7 +44,7 @@
 	}
 </style>
 
-{{template "base/head" .}}
+{{template "base/head_course" .}}
 <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 13557888c0..fa7a315487 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -4,7 +4,7 @@
         border-bottom:none !important
     }
 </style>
-{{template "base/head" .}}
+{{template "base/head_course" .}}
 <div class="organization teams">
 	{{template "org/header" .}}
 	{{template "org/navber_course" .}}
-- 
2.34.1


From 334dd4b5a7ed9baeba3ceb89c08b71b08e2e925c Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Fri, 21 Jan 2022 11:36:35 +0800
Subject: [PATCH 39/63] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8D=83=E6=A0=A1?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 1a046b79cf..3965ad805a 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -91,7 +91,7 @@
                             {{if .Topics }} 
                                 <div class="  tags "  style="position: relative;">
                                     {{range .Topics}}
-                                            {{if ne . "" }}<a  style="max-width:100%;margin: 5px 0;display:inline-flex;" href="{{AppSubUrl}}/explore/repos?q={{.}}&topic={{$.Topic}}" ><span class="ui small label topic omit"  >{{.}}</span></a>{{end}}
+                                            {{if ne . "" }}<a  style="max-width:100%;margin: 5px 0;display:inline-flex;"  ><span class="ui small label topic omit"  >{{.}}</span></a>{{end}}
                                     {{end}}
                                     
                                 </div>
-- 
2.34.1


From db01603dac47786d6367fc37a48a3668e2cd16a4 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 21 Jan 2022 11:43:18 +0800
Subject: [PATCH 40/63] fix issue

---
 templates/repo/createCourse.tmpl | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 9417001d71..5ca46bb3b7 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -1,3 +1,12 @@
+<style>
+#course_label::after{
+    display: inline-block;
+    vertical-align: top;
+    margin: -.2em 0 0 .2em;
+    content: '*';
+    color: #db2828;
+}
+</style>
 {{template "base/head" .}}
 <div class="repository new repo" style="margin-top: 40px;">
 	<div class="ui middle very relaxed page grid">
@@ -9,14 +18,14 @@
 				</h3>
 				<div class="ui attached segment">
 					{{template "base/alert" .}}
-					<div class="inline required field" >
+					<div class="inline required field {{if .Err_RepoName}}error{{end}}" >
                         <label for="Alias">{{.i18n.Tr "form.courseAlias"}}</label>
-                        <input id="alias" name="alias" value="" autofocus required>
+                        <input id="alias" name="alias" value="{{.alias}}" autofocus required>
                         <span class="help">{{.i18n.Tr "form.reponame_dash_dot_error"}}</span>
                     </div>
                 
                     <div class="inline required fields" style="margin-bottom: 0;">
-                        <label style="text-align: right;width: 250px!important;word-wrap: break-word;">{{.i18n.Tr "form.courseAdress"}}</label>
+                        <label id="course_label" style="text-align: right;width: 250px!important;word-wrap: break-word;">{{.i18n.Tr "form.courseAdress"}}</label>
                         <div class="required field {{if .Err_Owner}}error{{end}}" style="padding: 0;">
                             <div class="ui selection owner dropdown" id="ownerDropdown">
                                 <input type="hidden" id="uid" name="uid" value="{{.Owner.Name}}" required>
@@ -34,11 +43,11 @@
                     <span style="display: block;margin-bottom: 1em;" class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
                     <div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
                         <label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
-                        <span></span>
+                        <span style="flex: 1;"></span>
                     </div>
 
-                    <div class="inline required field">
-                        <label>{{.i18n.Tr "repo.model.manage.label"}}</label>
+                    <div class="inline  field" style="display: flex;align-items:center;">
+                        <label style="margin: .035714em 1em 0 0;">{{.i18n.Tr "repo.model.manage.label"}}</label>
                         <div class="ui multiple search selection dropdown" id="dropdown_container">
                             <input type="hidden" name="topics" value="">
                             <div class="default text" id="default_text">{{.i18n.Tr "repo.repo_label_helpe"}}</div>
-- 
2.34.1


From abd47789b4bdc57e20edf701012430ed67f79345 Mon Sep 17 00:00:00 2001
From: zhoupzh <hit172587zpz@163.com>
Date: Fri, 21 Jan 2022 12:02:17 +0800
Subject: [PATCH 41/63] fix issue

---
 templates/repo/createCourse.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 5ca46bb3b7..b31d58cb07 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -107,5 +107,4 @@ $(document).ready(function(){
         }
     });
 })
-
 </script>
\ No newline at end of file
-- 
2.34.1


From f0ed241d8b6fd8559680626f86a113e2e2a1cd99 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 21 Jan 2022 12:19:18 +0800
Subject: [PATCH 42/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9A=84iframe=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/context.go | 6 +++++-
 modules/setting/setting.go | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/context/context.go b/modules/context/context.go
index 6cb6c267a3..653a1895f2 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -328,7 +328,11 @@ func Contexter() macaron.Handler {
 			}
 		}
 
-		ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
+		if setting.IFrameURL != "" {
+			ctx.Resp.Header().Set(`X-Frame-Options`, `ALLOW-FROM `+setting.IFrameURL)
+		} else {
+			ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
+		}
 
 		ctx.Data["CsrfToken"] = html.EscapeString(x.GetToken())
 		ctx.Data["CsrfTokenHtml"] = template.HTML(`<input type="hidden" name="_csrf" value="` + ctx.Data["CsrfToken"].(string) + `">`)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 3d2bd91c58..5775ca5525 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -573,6 +573,7 @@ var (
 		OrgName  string
 		TeamName string
 	}{}
+	IFrameURL string
 )
 
 // DateLang transforms standard language locale name to corresponding value in datetime plugin.
@@ -1340,6 +1341,8 @@ func NewContext() {
 	sec = Cfg.Section("course")
 	Course.OrgName = sec.Key("org_name").MustString("")
 	Course.TeamName = sec.Key("team_name").MustString("")
+	sec = Cfg.Section("xFrame")
+	IFrameURL = sec.Key("url").MustString("")
 }
 
 func SetRadarMapConfig() {
-- 
2.34.1


From d4de187b07da5f03f9eff8b03497b7567af5fb04 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhouzh@pcl.ac.cn>
Date: Fri, 21 Jan 2022 14:26:29 +0800
Subject: [PATCH 43/63] fix issue

---
 templates/repo/createCourse.tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index b31d58cb07..5214c41c3d 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -107,4 +107,5 @@ $(document).ready(function(){
         }
     });
 })
+console.log()
 </script>
\ No newline at end of file
-- 
2.34.1


From 8bfce533e8342da1c37ef8baa1a87b79a0d67576 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 21 Jan 2022 15:45:27 +0800
Subject: [PATCH 44/63] fix issue

---
 templates/repo/courseHome.tmpl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/templates/repo/courseHome.tmpl b/templates/repo/courseHome.tmpl
index 7629fc1c6f..2c1cedbb71 100644
--- a/templates/repo/courseHome.tmpl
+++ b/templates/repo/courseHome.tmpl
@@ -135,8 +135,7 @@
 
 
 
-		<div class="ui mobile reversed stackable grid">
-			
+		<div class="ui mobile reversed stackable grid" style="margin-top: -1.5rem;">
 			{{ $n := len .TreeNames}}
 			{{ $l := Subtract $n 1}}
             <!-- If home page, show new PR. If not, show breadcrumb -->
@@ -251,12 +250,6 @@
                                                 </span>
                                             </td>
                                         {{end}}
-                                        
-                                        <!-- <td class="message nine wide">
-                                            <span class="truncate">
-                                                <a href="{{$.RepoLink}}/commit/{{$commit.ID}}" title="{{$commit.Summary}}">{{$commit.Summary | RenderEmoji}}</a>
-                                            </span>
-                                        </td> -->
                                         <td class="text right age one wide" style="text-align: right;">{{TimeSince $commit.Committer.When $.Lang}}</td>
                                     </tr>
                                 {{end}}
-- 
2.34.1


From f53283576db121e4356ad2f78ef94d2e553cbfb6 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 21 Jan 2022 15:50:13 +0800
Subject: [PATCH 45/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini | 2 +-
 options/locale/locale_zh-CN.ini | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 40e64cb062..079df6b9d4 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -394,7 +394,7 @@ lang_select_error = Select a language from the list.
 
 username_been_taken = The username is already taken.
 repo_name_been_taken = The repository name or path is already used.
-course_name_been_taken=The course path is already used.
+course_name_been_taken=The course name or path is already used.
 visit_rate_limit = Remote visit addressed rate limitation.
 2fa_auth_required = Remote visit required two factors authentication.
 org_name_been_taken = The organization name is already taken.
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 6887129966..350e7cefac 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -399,7 +399,7 @@ lang_select_error=从列表中选出语言
 
 username_been_taken=用户名已被使用。
 repo_name_been_taken=项目名称或项目路径已被使用。
-course_name_been_taken=课程名称或路径已被使用。
+course_name_been_taken=课程名称或地址已被使用。
 visit_rate_limit=远程访问达到速度限制。
 2fa_auth_required=远程访问需要双重验证。
 org_name_been_taken=组织名称已被使用。
-- 
2.34.1


From 71d279930f796adc762529fcaa45e6d4f9a39aa1 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Fri, 21 Jan 2022 17:57:35 +0800
Subject: [PATCH 46/63] =?UTF-8?q?=E5=8E=BB=E6=8E=89iframe=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/context.go | 6 +-----
 modules/setting/setting.go | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/context/context.go b/modules/context/context.go
index 653a1895f2..fd980fc6d3 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -328,11 +328,7 @@ func Contexter() macaron.Handler {
 			}
 		}
 
-		if setting.IFrameURL != "" {
-			ctx.Resp.Header().Set(`X-Frame-Options`, `ALLOW-FROM `+setting.IFrameURL)
-		} else {
-			ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
-		}
+		//ctx.Resp.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
 
 		ctx.Data["CsrfToken"] = html.EscapeString(x.GetToken())
 		ctx.Data["CsrfTokenHtml"] = template.HTML(`<input type="hidden" name="_csrf" value="` + ctx.Data["CsrfToken"].(string) + `">`)
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 5775ca5525..8622938e66 100755
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -573,7 +573,6 @@ var (
 		OrgName  string
 		TeamName string
 	}{}
-	IFrameURL string
 )
 
 // DateLang transforms standard language locale name to corresponding value in datetime plugin.
@@ -1341,8 +1340,7 @@ func NewContext() {
 	sec = Cfg.Section("course")
 	Course.OrgName = sec.Key("org_name").MustString("")
 	Course.TeamName = sec.Key("team_name").MustString("")
-	sec = Cfg.Section("xFrame")
-	IFrameURL = sec.Key("url").MustString("")
+
 }
 
 func SetRadarMapConfig() {
-- 
2.34.1


From 9ff89e9db00b5bfc947d5377f074c8b4f7d20525 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Fri, 21 Jan 2022 18:34:48 +0800
Subject: [PATCH 47/63] fix issue

---
 options/locale/locale_en-US.ini |  1 +
 options/locale/locale_zh-CN.ini |  1 +
 templates/org/course_list.tmpl  | 18 ++++++------
 templates/org/home_courses.tmpl | 49 ++++++++++++++++-----------------
 4 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 40e64cb062..c6099b66e2 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -876,6 +876,7 @@ all=All
 
 computing.all = All
 computing.Introduction=Introduction
+computing.success=Join Success
 
 modelarts.status=Status
 modelarts.createtime=CreateTime
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 6887129966..dbf417104d 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -883,6 +883,7 @@ all=所有
 
 computing.all=全部
 computing.Introduction=简介
+computing.success=加入成功
 
 modelarts.status=状态
 modelarts.createtime=创建时间
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index 3965ad805a..e07fb7d16a 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -75,17 +75,14 @@
 	.card{
         box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60) !important;
         border-radius: 5px;
-        border: 1px solid rgba(232, 232, 232, 100)    
+        border: 1px solid #E8E8E8 !important;
 	}
 
 </style>
-
     <div style="width: 100%;">
-  
         <div class="ui three cards" style="margin-bottom: 10px;">
             {{range .Repos}}
                 <div class="card " >
-                
                     <div class="extra full_height cor"  >
                         <div class="content " >
                             {{if .Topics }} 
@@ -96,9 +93,7 @@
                                     
                                 </div>
                             {{end}}  
-                            
                         </div> 
-
                         <div class=" header header_card omit" >
                             <a class="header_card image poping up "   href="{{.Link}}" data-content="{{.Alias}}" data-position="top left" data-variation="tiny inverted">  {{.Alias}}</a>
                         </div>
@@ -106,19 +101,21 @@
                         <div class='content descript_height nowrap-2'>
                             {{.Description}}
                         </div>
-                        
-                        
-                                                        
-                        
                     </div>
                     <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;margin-bottom: 15px;">                            
                         <div class="left aligned author">
                         <!-- <span > -->
                            
                             {{if  .Creator }}
+                            <a href="{{.Creator.Name}}" title="{{.Creator.Name}}">
                                 <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px"  src="{{.Creator.RelAvatarLink}}">
+                            </a>
+                                
                             {{else}}
+                            <a href="{{.Owner.Name}}" title="{{.Owner.Name}}">
                                 <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px"  src="{{.Owner.RelAvatarLink}}">
+                            </a>
+                                
                             {{end}}
 
                             {{$.i18n.Tr "org.repo_released"}}&nbsp;: &nbsp; {{TimeSinceUnixShort  .CreatedUnix}}
@@ -132,6 +129,7 @@
     </div>
 
 <script>
+    console.log({{.Repos}})
     var data;
     var filterData=[];
     var num=0;
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 401a3b5f0e..0bafb2cb73 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -81,7 +81,10 @@
 		}
 	
 	</style>
+	
 	{{template "base/head_course" .}}
+	<!-- 提示框 -->
+	<div class="alert"></div>
 	<div class="organization profile">
 		{{/* overflow: auto is the clearfix - this avoids the image going beyond
 		the container where it is supposed to stay inside. */}}
@@ -113,7 +116,7 @@
 			
 				<div class="ui sixteen wide computer column">
 					<div class="ui mobile reversed stackable grid">
-						<div class="ui ten wide tablet eleven wide computer column" id='tag'>
+						<div class="ui ten wide tablet twelve wide computer column" id='tag'>
 		
 							<a class="{{if eq $.Keyword "" }} tag_bg {{end}} tag_key ui small tag_lable topic omit"  href="{{$.Link}}?" >{{$.i18n.Tr "org.all_keywords"}}</span></a>
 	
@@ -126,47 +129,40 @@
 							{{end}}
 						</div>
 					
-						<div class="ui sixteen wide mobile six wide tablet five wide computer column">
+						<div class="ui sixteen wide mobile six wide tablet four wide computer column">
 							<!-- {{if .CanCreateOrgRepo}} -->
-								<div class="text center" style="margin-left: 10px;">
-									<a class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
+								<div class="text center" >
+									<a style="width: 80%;" class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
 								</div>
 							<!-- {{end}} -->
 						</div>
 					</div>
 				</div>
 			</div>
-	
 			<!-- 全部 -->
-	
 			<div class="ui stackable grid">	
-			
 				<div class="ui sixteen wide computer column">
 					<div class="ui mobile reversed stackable grid">
-						<div class="ui ten wide tablet eleven wide computer column">
+						<div class="ui ten wide tablet twelve wide computer column">
 							{{template "org/course_list" .}}
 							{{template "base/paginate" .}}
 						</div>
-	
-						<div class="ui sixteen wide mobile six wide tablet five wide computer column">
-	
+						<div class="ui sixteen wide mobile six wide tablet four wide computer column">
 							<h4 class="ui top attached header noborder">
 								<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
 								<div class="ui right">
 									<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
 								</div>
 							</h4>
-				   
 							<div class="ui attached table segment course items noborder">
 								{{ range .tags}}
 									{{if eq .TagName "精选项目"}} 
-								   
 										{{range $i, $v := .RepoList}}
 											{{if gt $i 0}}
 												<div class="ui divider" style="margin-bottom:10px;"></div>
 											{{end}}
 											<div class="item">
-												<i class="ri-bookmark-3-line course_color" ></i>
+												<i class="large icon ri-bookmark-3-line course_color"></i>
 												<div class="content"  style="margin-left: 10px;">
 													<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
 													<p class="text grey">
@@ -182,10 +178,7 @@
 										{{end}}
 									{{end}}
 								{{end}}
-							
 							</div>
-	
-							
 							<h4 class="ui top attached header noborder">
 								<strong>{{.i18n.Tr "org.people"}}</strong>
 								<div class="ui right">
@@ -204,7 +197,6 @@
 									<a class="ui blue basic button" onclick="jion_course_team()"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
 								</div>
 							</div>
-	
 							{{if .IsOrganizationMember}}
 								<div class="ui top attached header noborder">
 									<strong>{{.i18n.Tr "org.teams"}}</strong>
@@ -224,8 +216,8 @@
 									{{end}}
 								</div>
 								{{if .IsOrganizationOwner}}
-									<div class="ui bottom attached segment noborder">
-										<a class="ui blue small button" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
+									<div class="ui bottom attached segment text center noborder">
+										<a class="ui blue basic  button" style="width: 80%;" href="{{.OrgLink}}/teams/new">{{.i18n.Tr "org.create_new_team"}}</a>
 									</div>
 								{{end}}
 							{{end}}
@@ -430,13 +422,18 @@
 				async:false,
 				success:function(json){
 					data = json;
-					if(data.code==0){
-						alert("Join  success")
-						location.reload()  
+					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();
+					}
+					// if(data.code==0){
+					// 	alert("Join  success")
+					// 	location.reload()  
 	
-					}else{
-						alert("Join failure")
-					} 
+					// }else{
+					// 	alert("Join failure")
+					// } 
 				}
 			});
 		}
-- 
2.34.1


From b5e4e0b1307d8ec9c07b9d9222a139eea6eea411 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 09:42:26 +0800
Subject: [PATCH 48/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/org/setting.go | 14 +++++++++-----
 routers/org/teams.go   | 43 ++++++++++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/routers/org/setting.go b/routers/org/setting.go
index 348d8cc8d8..786b8269e1 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -19,7 +19,8 @@ import (
 
 const (
 	// tplSettingsOptions template path for render settings
-	tplSettingsOptions base.TplName = "org/settings/options"
+	tplSettingsOptions       base.TplName = "org/settings/options"
+	tplSettingsCourseOptions base.TplName = "org/settings/course_options"
 	// tplSettingsDelete template path for render delete repository
 	tplSettingsDelete base.TplName = "org/settings/delete"
 	// tplSettingsHooks template path for render hook settings
@@ -34,7 +35,9 @@ func Settings(ctx *context.Context) {
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
-	ctx.HTML(200, tplSettingsOptions)
+
+	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions))
+
 }
 
 // SettingsPost response for settings change submited
@@ -42,9 +45,10 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
+	template := getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions)
 
 	if ctx.HasError() {
-		ctx.HTML(200, tplSettingsOptions)
+		ctx.HTML(200, template)
 		return
 	}
 
@@ -58,12 +62,12 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 			return
 		} else if isExist {
 			ctx.Data["OrgName"] = true
-			ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form)
+			ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), template, &form)
 			return
 		} else if err = models.ChangeUserName(org, form.Name); err != nil {
 			if err == models.ErrUserNameIllegal {
 				ctx.Data["OrgName"] = true
-				ctx.RenderWithErr(ctx.Tr("form.illegal_username"), tplSettingsOptions, &form)
+				ctx.RenderWithErr(ctx.Tr("form.illegal_username"), template, &form)
 			} else {
 				ctx.ServerError("ChangeUserName", err)
 			}
diff --git a/routers/org/teams.go b/routers/org/teams.go
index 17c424578b..ab3a6a21cf 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -27,11 +27,15 @@ const (
 	tplTeams       base.TplName = "org/team/teams"
 	tplCourseTeams base.TplName = "org/team/courseTeams"
 	// tplTeamNew template path for create new team page
-	tplTeamNew base.TplName = "org/team/new"
+	tplTeamNew       base.TplName = "org/team/new"
+	tplTeamCourseNew base.TplName = "org/team/course_new"
+
 	// tplTeamMembers template path for showing team members page
-	tplTeamMembers base.TplName = "org/team/members"
+	tplTeamMembers       base.TplName = "org/team/members"
+	tplCourseTeamMembers base.TplName = "org/team/course_members"
 	// tplTeamRepositories template path for showing team repositories page
-	tplTeamRepositories base.TplName = "org/team/repositories"
+	tplTeamRepositories       base.TplName = "org/team/repositories"
+	tplCousreTeamRepositories base.TplName = "org/team/course_repositories"
 )
 
 // Teams render teams list page
@@ -47,12 +51,17 @@ func Teams(ctx *context.Context) {
 		}
 	}
 	ctx.Data["Teams"] = org.Teams
+
+	ctx.HTML(200, getTemplate(org, tplCourseTeams, tplTeams))
+
+}
+
+func getTemplate(org *models.User, courseTemplate base.TplName, normalTemplate base.TplName) base.TplName {
 	if setting.Course.OrgName == org.Name {
-		ctx.HTML(200, tplCourseTeams)
+		return courseTemplate
 	} else {
-		ctx.HTML(200, tplTeams)
+		return normalTemplate
 	}
-
 }
 
 // TeamsAction response for join, leave, remove, add operations to team
@@ -191,7 +200,7 @@ func NewTeam(ctx *context.Context) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Team"] = &models.Team{}
 	ctx.Data["Units"] = models.Units
-	ctx.HTML(200, tplTeamNew)
+	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew))
 }
 
 // NewTeamPost response for create new team
@@ -201,6 +210,7 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Units"] = models.Units
 	var includesAllRepositories = (form.RepoAccess == "all")
+	template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)
 
 	t := &models.Team{
 		OrgID:                   ctx.Org.Organization.ID,
@@ -225,12 +235,12 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["Team"] = t
 
 	if ctx.HasError() {
-		ctx.HTML(200, tplTeamNew)
+		ctx.HTML(200, template)
 		return
 	}
 
 	if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 {
-		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form)
+		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form)
 		return
 	}
 
@@ -238,7 +248,7 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 		ctx.Data["Err_TeamName"] = true
 		switch {
 		case models.IsErrTeamAlreadyExist(err):
-			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form)
+			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form)
 		default:
 			ctx.ServerError("NewTeam", err)
 		}
@@ -257,7 +267,7 @@ func TeamMembers(ctx *context.Context) {
 		ctx.ServerError("GetMembers", err)
 		return
 	}
-	ctx.HTML(200, tplTeamMembers)
+	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCourseTeamMembers, tplTeamMembers))
 }
 
 // TeamRepositories show the repositories of team
@@ -269,7 +279,7 @@ func TeamRepositories(ctx *context.Context) {
 		ctx.ServerError("GetRepositories", err)
 		return
 	}
-	ctx.HTML(200, tplTeamRepositories)
+	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCousreTeamRepositories, tplTeamRepositories))
 }
 
 // EditTeam render team edit page
@@ -279,7 +289,7 @@ func EditTeam(ctx *context.Context) {
 	ctx.Data["team_name"] = ctx.Org.Team.Name
 	ctx.Data["desc"] = ctx.Org.Team.Description
 	ctx.Data["Units"] = models.Units
-	ctx.HTML(200, tplTeamNew)
+	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew))
 }
 
 // EditTeamPost response for modify team information
@@ -289,6 +299,7 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["PageIsOrgTeams"] = true
 	ctx.Data["Team"] = t
 	ctx.Data["Units"] = models.Units
+	template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)
 
 	isAuthChanged := false
 	isIncludeAllChanged := false
@@ -327,12 +338,12 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	t.CanCreateOrgRepo = form.CanCreateOrgRepo
 
 	if ctx.HasError() {
-		ctx.HTML(200, tplTeamNew)
+		ctx.HTML(200, template)
 		return
 	}
 
 	if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 {
-		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form)
+		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form)
 		return
 	}
 
@@ -340,7 +351,7 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 		ctx.Data["Err_TeamName"] = true
 		switch {
 		case models.IsErrTeamAlreadyExist(err):
-			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form)
+			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form)
 		default:
 			ctx.ServerError("UpdateTeam", err)
 		}
-- 
2.34.1


From eafe664fcc8a59b4fd7e08155712733bbc100c26 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 09:58:05 +0800
Subject: [PATCH 49/63] revert

---
 routers/org/setting.go | 14 +++++---------
 routers/org/teams.go   | 43 ++++++++++++++++--------------------------
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/routers/org/setting.go b/routers/org/setting.go
index 786b8269e1..348d8cc8d8 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -19,8 +19,7 @@ import (
 
 const (
 	// tplSettingsOptions template path for render settings
-	tplSettingsOptions       base.TplName = "org/settings/options"
-	tplSettingsCourseOptions base.TplName = "org/settings/course_options"
+	tplSettingsOptions base.TplName = "org/settings/options"
 	// tplSettingsDelete template path for render delete repository
 	tplSettingsDelete base.TplName = "org/settings/delete"
 	// tplSettingsHooks template path for render hook settings
@@ -35,9 +34,7 @@ func Settings(ctx *context.Context) {
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
 	ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
-
-	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions))
-
+	ctx.HTML(200, tplSettingsOptions)
 }
 
 // SettingsPost response for settings change submited
@@ -45,10 +42,9 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
-	template := getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions)
 
 	if ctx.HasError() {
-		ctx.HTML(200, template)
+		ctx.HTML(200, tplSettingsOptions)
 		return
 	}
 
@@ -62,12 +58,12 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 			return
 		} else if isExist {
 			ctx.Data["OrgName"] = true
-			ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), template, &form)
+			ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form)
 			return
 		} else if err = models.ChangeUserName(org, form.Name); err != nil {
 			if err == models.ErrUserNameIllegal {
 				ctx.Data["OrgName"] = true
-				ctx.RenderWithErr(ctx.Tr("form.illegal_username"), template, &form)
+				ctx.RenderWithErr(ctx.Tr("form.illegal_username"), tplSettingsOptions, &form)
 			} else {
 				ctx.ServerError("ChangeUserName", err)
 			}
diff --git a/routers/org/teams.go b/routers/org/teams.go
index ab3a6a21cf..17c424578b 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -27,15 +27,11 @@ const (
 	tplTeams       base.TplName = "org/team/teams"
 	tplCourseTeams base.TplName = "org/team/courseTeams"
 	// tplTeamNew template path for create new team page
-	tplTeamNew       base.TplName = "org/team/new"
-	tplTeamCourseNew base.TplName = "org/team/course_new"
-
+	tplTeamNew base.TplName = "org/team/new"
 	// tplTeamMembers template path for showing team members page
-	tplTeamMembers       base.TplName = "org/team/members"
-	tplCourseTeamMembers base.TplName = "org/team/course_members"
+	tplTeamMembers base.TplName = "org/team/members"
 	// tplTeamRepositories template path for showing team repositories page
-	tplTeamRepositories       base.TplName = "org/team/repositories"
-	tplCousreTeamRepositories base.TplName = "org/team/course_repositories"
+	tplTeamRepositories base.TplName = "org/team/repositories"
 )
 
 // Teams render teams list page
@@ -51,17 +47,12 @@ func Teams(ctx *context.Context) {
 		}
 	}
 	ctx.Data["Teams"] = org.Teams
-
-	ctx.HTML(200, getTemplate(org, tplCourseTeams, tplTeams))
-
-}
-
-func getTemplate(org *models.User, courseTemplate base.TplName, normalTemplate base.TplName) base.TplName {
 	if setting.Course.OrgName == org.Name {
-		return courseTemplate
+		ctx.HTML(200, tplCourseTeams)
 	} else {
-		return normalTemplate
+		ctx.HTML(200, tplTeams)
 	}
+
 }
 
 // TeamsAction response for join, leave, remove, add operations to team
@@ -200,7 +191,7 @@ func NewTeam(ctx *context.Context) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Team"] = &models.Team{}
 	ctx.Data["Units"] = models.Units
-	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew))
+	ctx.HTML(200, tplTeamNew)
 }
 
 // NewTeamPost response for create new team
@@ -210,7 +201,6 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["PageIsOrgTeamsNew"] = true
 	ctx.Data["Units"] = models.Units
 	var includesAllRepositories = (form.RepoAccess == "all")
-	template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)
 
 	t := &models.Team{
 		OrgID:                   ctx.Org.Organization.ID,
@@ -235,12 +225,12 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["Team"] = t
 
 	if ctx.HasError() {
-		ctx.HTML(200, template)
+		ctx.HTML(200, tplTeamNew)
 		return
 	}
 
 	if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 {
-		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form)
+		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form)
 		return
 	}
 
@@ -248,7 +238,7 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 		ctx.Data["Err_TeamName"] = true
 		switch {
 		case models.IsErrTeamAlreadyExist(err):
-			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form)
+			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form)
 		default:
 			ctx.ServerError("NewTeam", err)
 		}
@@ -267,7 +257,7 @@ func TeamMembers(ctx *context.Context) {
 		ctx.ServerError("GetMembers", err)
 		return
 	}
-	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCourseTeamMembers, tplTeamMembers))
+	ctx.HTML(200, tplTeamMembers)
 }
 
 // TeamRepositories show the repositories of team
@@ -279,7 +269,7 @@ func TeamRepositories(ctx *context.Context) {
 		ctx.ServerError("GetRepositories", err)
 		return
 	}
-	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCousreTeamRepositories, tplTeamRepositories))
+	ctx.HTML(200, tplTeamRepositories)
 }
 
 // EditTeam render team edit page
@@ -289,7 +279,7 @@ func EditTeam(ctx *context.Context) {
 	ctx.Data["team_name"] = ctx.Org.Team.Name
 	ctx.Data["desc"] = ctx.Org.Team.Description
 	ctx.Data["Units"] = models.Units
-	ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew))
+	ctx.HTML(200, tplTeamNew)
 }
 
 // EditTeamPost response for modify team information
@@ -299,7 +289,6 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	ctx.Data["PageIsOrgTeams"] = true
 	ctx.Data["Team"] = t
 	ctx.Data["Units"] = models.Units
-	template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)
 
 	isAuthChanged := false
 	isIncludeAllChanged := false
@@ -338,12 +327,12 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 	t.CanCreateOrgRepo = form.CanCreateOrgRepo
 
 	if ctx.HasError() {
-		ctx.HTML(200, template)
+		ctx.HTML(200, tplTeamNew)
 		return
 	}
 
 	if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 {
-		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form)
+		ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form)
 		return
 	}
 
@@ -351,7 +340,7 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
 		ctx.Data["Err_TeamName"] = true
 		switch {
 		case models.IsErrTeamAlreadyExist(err):
-			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form)
+			ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form)
 		default:
 			ctx.ServerError("UpdateTeam", err)
 		}
-- 
2.34.1


From 0f523f157931d46707ac177e99e20ee04d48baf7 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 10:20:25 +0800
Subject: [PATCH 50/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=89=8D=E7=AB=AF=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/context.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/context/context.go b/modules/context/context.go
index fd980fc6d3..807b6dab12 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -65,6 +65,15 @@ func (ctx *Context) IsUserRepoAdmin() bool {
 	return ctx.Repo.IsAdmin()
 }
 
+func (ctx *Context) IsCourse() bool {
+	if ctx.Org != nil && ctx.Org.Organization != nil {
+		if ctx.Org.Organization.Name == setting.Course.OrgName {
+			return true
+		}
+	}
+	return false
+}
+
 // IsUserRepoWriter returns true if current user has write privilege in current repo
 func (ctx *Context) IsUserRepoWriter(unitTypes []models.UnitType) bool {
 	for _, unitType := range unitTypes {
-- 
2.34.1


From 80b09207facbab46af8340c430f66059c82acf0a Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 12:19:58 +0800
Subject: [PATCH 51/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0iscourse=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/context.go | 9 ---------
 modules/context/org.go     | 2 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/context/context.go b/modules/context/context.go
index 807b6dab12..fd980fc6d3 100755
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -65,15 +65,6 @@ func (ctx *Context) IsUserRepoAdmin() bool {
 	return ctx.Repo.IsAdmin()
 }
 
-func (ctx *Context) IsCourse() bool {
-	if ctx.Org != nil && ctx.Org.Organization != nil {
-		if ctx.Org.Organization.Name == setting.Course.OrgName {
-			return true
-		}
-	}
-	return false
-}
-
 // IsUserRepoWriter returns true if current user has write privilege in current repo
 func (ctx *Context) IsUserRepoWriter(unitTypes []models.UnitType) bool {
 	for _, unitType := range unitTypes {
diff --git a/modules/context/org.go b/modules/context/org.go
index 9b87fba9fd..7baf61ea8d 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -63,6 +63,8 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	org := ctx.Org.Organization
 	ctx.Data["Org"] = org
 
+	ctx.Data["IsCourse"] = orgName == setting.Course.OrgName
+
 	// Force redirection when username is actually a user.
 	if !org.IsOrganization() {
 		ctx.Redirect(setting.AppSubURL + "/" + org.Name)
-- 
2.34.1


From 5c82e8a68372943d2c68dad205eba396093e81ee Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 12:27:36 +0800
Subject: [PATCH 52/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/repo/course.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/routers/repo/course.go b/routers/repo/course.go
index 9cdb5c12e7..44acdfcc0d 100644
--- a/routers/repo/course.go
+++ b/routers/repo/course.go
@@ -22,6 +22,7 @@ func CreateCourse(ctx *context.Context) {
 	org, _ := models.GetUserByName(setting.Course.OrgName)
 
 	ctx.Data["Owner"] = org
+	ctx.Data["IsCourse"] = true
 
 	ctx.HTML(200, tplCreateCourse)
 
@@ -37,6 +38,7 @@ func CreateCoursePost(ctx *context.Context, form auth.CreateCourseForm) {
 	org, _ := models.GetUserByName(setting.Course.OrgName)
 
 	ctx.Data["Owner"] = org
+	ctx.Data["IsCourse"] = true
 
 	var topics = make([]string, 0)
 	var topicsStr = strings.TrimSpace(form.Topics)
-- 
2.34.1


From 315fe9e961fee5d461129531d5986391755aa076 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 24 Jan 2022 13:05:11 +0800
Subject: [PATCH 53/63] =?UTF-8?q?=E4=BF=AE=E6=94=B91439=201437=201434=2014?=
 =?UTF-8?q?33=201431?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base/head.tmpl                 |  23 +--
 templates/org/course_list.tmpl           | 173 ++---------------------
 templates/org/home_courses.tmpl          |  81 ++++++-----
 templates/org/member/course_members.tmpl |   2 +-
 templates/org/team/courseTeams.tmpl      |   2 +-
 5 files changed, 75 insertions(+), 206 deletions(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 75496aed5a..88b93f1861 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -200,14 +200,16 @@ var _hmt = _hmt || [];
 			<div class="ui top secondary stackable main menu following bar dark">
 				{{template "base/head_navbar" .}}
 			</div><!-- end bar -->
-			<div  class="notic_content" id ="notic_content"  >
-				<a  href={{.notice.Link}} class="a_width">
-					<marquee behavior="scroll" direction="left">
-						{{.notice.Title}}
-					</marquee>
-				</a>
-				<i class="ri-close-fill x_icon" onclick="closeNoice()"></i>
-			</div>
+			{{if not .IsCourse}}
+				<div  class="notic_content" id ="notic_content"  >
+					<a  href={{.notice.Link}} class="a_width">
+						<marquee behavior="scroll" direction="left">
+							{{.notice.Title}}
+						</marquee>
+					</a>
+					<i class="ri-close-fill x_icon" onclick="closeNoice()"></i>
+				</div>
+			{{end}}
 		{{end}}
 {{/*
 	</div>
@@ -247,5 +249,8 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	isShowNotice();
+
+	if(! ".PageIsInstall") {
+		isShowNotice();
+	}
 </script>
\ No newline at end of file
diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl
index e07fb7d16a..a4d140e46f 100644
--- a/templates/org/course_list.tmpl
+++ b/templates/org/course_list.tmpl
@@ -62,9 +62,9 @@
         -webkit-line-clamp: 2;
         -webkit-box-orient: vertical;
     }
-    .ui.label{
+    .course_topic{
         color:#0366D6 !important;
-        background-color: #B3DBDB !important;
+        background-color: rgba(179, 219, 219, 0.4) !important;     
         font-weight:normal !important
     }
     .tag_text{
@@ -75,8 +75,16 @@
 	.card{
         box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60) !important;
         border-radius: 5px;
-        border: 1px solid #E8E8E8 !important;
+        border:1px solid  #E8E8E8 !important;
 	}
+    .tags{
+        position: relative;
+        overflow: hidden;
+        height: 30px; 
+        line-height: 30px; 
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+    }
 
 </style>
     <div style="width: 100%;">
@@ -86,9 +94,9 @@
                     <div class="extra full_height cor"  >
                         <div class="content " >
                             {{if .Topics }} 
-                                <div class="  tags "  style="position: relative;">
+                                <div class="omit  tags "  style="position: relative;">
                                     {{range .Topics}}
-                                            {{if ne . "" }}<a  style="max-width:100%;margin: 5px 0;display:inline-flex;"  ><span class="ui small label topic omit"  >{{.}}</span></a>{{end}}
+                                            {{if ne . "" }}<a  style="max-width:100%;margin: 5px 0;display:inline-flex;"  ><span class="ui small label topic course_topic"  >{{.}}</span></a>{{end}}
                                     {{end}}
                                     
                                 </div>
@@ -127,158 +135,3 @@
         </div>
                     
     </div>
-
-<script>
-    console.log({{.Repos}})
-    var data;
-    var filterData=[];
-    var num=0;
-
-    function showcreate(obj){
-        document.getElementById("search_selectPro").value=''
-        $('.ui.modal')
-        .modal({
-            centered: false,
-            onShow:function(){
-                $("#org_list").empty()                
-                getPro(1)
-                
-            },
-            onHide:function(){
-  
-            }
-        })
-        .modal('show')
-    }
-    function getPro(typeTag){
-
-        $.ajax({
-            type:"GET",
-            url:"/org/{{.Org.Name}}/org_tag/repo_list?tagId="+typeTag,
-            dataType:"json",
-            async:false,
-            success:function(json){
-                data = json.data;
-                var n_length = data.length
-                pro_html = getHTML(data)
-                $("#org_list").append(pro_html)
-                // console.log('原始',data)
-                checkedNum(0)
-            }
-        });
-    }
-    function getHTML(data){
-        let pro_html=''
-        for (let i=0;i<data.length;i++){
-            if (data[i].Selected==true){
-                console.log("data[i]:",data[i])
-                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = " ${i}" checked="" onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}"  data-selected=${data[i].Selected} > <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName}</label></div>`
-                pro_html += '</div>'
-            }
-            else{
-                pro_html += `<div class="ui checkbox" style="width: 33%;margin-bottom:10px" > <input type="checkbox" id = "${i}"  onclick="checkedNum(${i})" class="Relist" name ='select_pro_name' data-repoid="${data[i].RepoID}" data-reponame="${data[i].RepoName}" data-selected= ${data[i].Selected}> <label class='omit image poping up' data-content=${data[i].RepoName}  data-position="top left " data-variation="mini"> ${data[i].RepoName} </label></div>`
-                pro_html += '</div>'
-            }
-        }
-        return pro_html
-    }
-    function saveSeletedPro(typeTag){
-        var saveData=[];
-        $('input[name="select_pro_name"]:checked').each(function(){
-            // console.log('值',this.dataset.repoid)
-
-            saveData.push(parseInt(this.dataset.repoid));
-        })
-        if(saveData.length>9){
-            alert("最多可选9个，保存失败")
-            return
-        }
-        // saveData = getSelecteDataID();
-        // console.log("数据：",saveData)
-        $.ajax({
-         type:"POST",
-         url:"/org/{{.Org.Name}}/org_tag/repo_submit?tagId="+typeTag,
-         contentType:'application/json',
-         dataType:"json",
-         async:false,
-         data:JSON.stringify({'repoList':saveData
-               }),        
-           success:function(res){
-             console.log('保存成功');
-             location.reload()  
-
-          }
-         });
-    }
-
-    function getSelecteData(){
-        var selectedData=[];
-        $('input[name="select_pro_name"]:checked').each(function(){
-            // console.log(this)
-            // console.log('值',this.dataset.selected)
-
-            selectedData.push({"RepoID":parseInt(this.dataset.repoid),"RepoName":this.dataset.reponame,"Selected":JSON.parse(this.dataset.selected)});
-        })
-        return selectedData
-    }
-    function search(){
-        var selectedData = getSelecteData();
-        var searchValue = document.getElementById("search_selectPro").value;
-        filterData=[];
-        console.log("searchValue:",searchValue)
-        for (let i=0;i<data.length;i++){
-            var isInclude=false; 
-            if(data[i].RepoName.toLowerCase().includes(searchValue.toLowerCase())){
-                filterData.push(data[i])
-            }
-        }
-        // 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)
-        $("#org_list").empty()
-        if(searchValue!=""){
-            if (filterData.length!=0){
-                
-                var pro_html = getHTML(selectedData);
-                console.log("selectedData_pro_html:",pro_html)
-                $("#org_list").append(pro_html)
-                pro_html= getHTML(filterData);
-                $("#org_list").append(pro_html)
-            }else{
-                var pro_html = getHTML(selectedData);
-                $("#org_list").append(pro_html)
-            }
-        }else{
-            var pro_html = getHTML(data);
-            $("#org_list").append(pro_html)
-        }
-    }
-
-    function checkedNum(id){
-
-        num=0;
-        var inputs = document.getElementsByName("select_pro_name")
-        for (var i=0;i<inputs.length;i++){
-            if(inputs[i].checked){
-                num++
-                if(num>9){
-                    document.getElementById(id).checked=false
-                    alert("选择超过9个，请重新选择！")
-                    return
-                }
-            }
-                
-        }
-
-        var show_num = 9-num;
-        document.getElementById("recommend").innerHTML="还能推荐"+show_num+"个"
-
-    }
-
-</script>
\ No newline at end of file
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 0bafb2cb73..e9e80b5e64 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -79,10 +79,15 @@
 		.noborder{
 			border: none !important;
 		}
+		.div_bt{
+			text-align: center;
+			margin-top: 5px;
+			margin-top: 10px;
+		}
 	
 	</style>
 	
-	{{template "base/head_course" .}}
+	{{template "base/head" .}}
 	<!-- 提示框 -->
 	<div class="alert"></div>
 	<div class="organization profile">
@@ -131,7 +136,7 @@
 					
 						<div class="ui sixteen wide mobile six wide tablet four wide computer column">
 							<!-- {{if .CanCreateOrgRepo}} -->
-								<div class="text center" >
+								<div class=" ui bottom attached segment text center noborder  text center" > 
 									<a style="width: 80%;" class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
 								</div>
 							<!-- {{end}} -->
@@ -148,44 +153,49 @@
 							{{template "base/paginate" .}}
 						</div>
 						<div class="ui sixteen wide mobile six wide tablet four wide computer column">
-							<h4 class="ui top attached header noborder">
-								<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
-								<div class="ui right">
-									<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
-								</div>
-							</h4>
-							<div class="ui attached table segment course items noborder">
-								{{ range .tags}}
-									{{if eq .TagName "精选项目"}} 
-										{{range $i, $v := .RepoList}}
-											{{if gt $i 0}}
-												<div class="ui divider" style="margin-bottom:10px;"></div>
-											{{end}}
-											<div class="item">
-												<i class="large icon ri-bookmark-3-line course_color"></i>
-												<div class="content"  style="margin-left: 10px;">
-													<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
-													<p class="text grey">
-														{{if ne .CreatorID 0}}
-															{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
-														{{else}}
-														{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
-														{{end}}
-													</p>
+							{{if .tags}} 
+								<h4 class="ui top attached header noborder">
+									<strong>{{.i18n.Tr "org.selected_couse"}}</strong>
+									{{if .IsOrganizationOwner}}  
+										<div class="ui right">
+											<a class="text grey"  id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
+										</div>
+									{{end}}
+								</h4>
+						
+								<div class="ui attached table segment course items noborder">
+									{{ range .tags}}
+										{{if eq .TagName "精选项目"}} 
+											{{range $i, $v := .RepoList}}
+												{{if gt $i 0}}
+													<div class="ui divider" style="margin-bottom:10px;"></div>
+												{{end}}
+												<div class="item">
+													<i class="large icon ri-bookmark-3-line course_color"></i>
+													<div class="content"  style="margin-left: 10px;">
+														<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
+														<p class="text grey">
+															{{if ne .CreatorID 0}}
+																{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
+															{{else}}
+															{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
+															{{end}}
+														</p>
+													</div>
 												</div>
-											</div>
-	
+		
+											{{end}}
 										{{end}}
 									{{end}}
-								{{end}}
-							</div>
+								</div>
+							{{end}}
 							<h4 class="ui top attached header noborder">
 								<strong>{{.i18n.Tr "org.people"}}</strong>
 								<div class="ui right">
 									<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
 								</div>
 							</h4>
-							<div class="ui attached segment members noborder">
+							<div class="ui attached segment members course noborder">
 								{{$isMember := .IsOrganizationMember}}
 								{{range .Members}}
 									{{if or $isMember (.IsPublicMember $.Org.ID)}}
@@ -193,8 +203,8 @@
 									{{end}}
 								{{end}}
 	
-								<div style="text-align: center;margin-top: 5px;"> 
-									<a class="ui blue basic button" onclick="jion_course_team()"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+								<div class="ui bottom attached segment text center noborder"> 
+									<a class="ui blue basic button" onclick="jion_course_team()" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
 								</div>
 							</div>
 							{{if .IsOrganizationMember}}
@@ -204,9 +214,9 @@
 										<a class="text grey" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right" 16}}</a>
 									</div>
 								</div>
-								<div class="ui attached table segment teams noborder">
+								<div class="ui attached table segment teams  noborder">
 									{{range .Teams}}
-										<div class="item">
+										<div style="margin-top: 10px;">
 											<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong class="team-name">{{.Name}}</strong></a>
 											<p class="text grey">
 												<a href="{{$.OrgLink}}/teams/{{.LowerName}}"><strong>{{.NumMembers}}</strong> {{$.i18n.Tr "org.lower_members"}}</a> ·
@@ -427,6 +437,7 @@
 					} 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()  
diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl
index 2c710ec2bc..40f933e32c 100644
--- a/templates/org/member/course_members.tmpl
+++ b/templates/org/member/course_members.tmpl
@@ -44,7 +44,7 @@
 	}
 </style>
 
-{{template "base/head_course" .}}
+{{template "base/head" .}}
 <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 fa7a315487..13557888c0 100644
--- a/templates/org/team/courseTeams.tmpl
+++ b/templates/org/team/courseTeams.tmpl
@@ -4,7 +4,7 @@
         border-bottom:none !important
     }
 </style>
-{{template "base/head_course" .}}
+{{template "base/head" .}}
 <div class="organization teams">
 	{{template "org/header" .}}
 	{{template "org/navber_course" .}}
-- 
2.34.1


From 22a1f797056fbc850125d38e9d88e43d65086ee0 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 15:03:37 +0800
Subject: [PATCH 54/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/repo.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index 4da6e9a163..64f02c9215 100755
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -402,6 +402,7 @@ func RepoAssignment() macaron.Handler {
 		}
 		ctx.Repo.Owner = owner
 		ctx.Data["Username"] = ctx.Repo.Owner.Name
+		ctx.Data["IsCourse"] = owner.Name == setting.Course.OrgName
 
 		// Get repository.
 		repo, err := models.GetRepositoryByName(owner.ID, repoName)
-- 
2.34.1


From 4459712293c892a878e995f6865b2dbac55a1d45 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Mon, 24 Jan 2022 15:05:13 +0800
Subject: [PATCH 55/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/context/org.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/context/org.go b/modules/context/org.go
index 7baf61ea8d..9b3f720c97 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -63,7 +63,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
 	org := ctx.Org.Organization
 	ctx.Data["Org"] = org
 
-	ctx.Data["IsCourse"] = orgName == setting.Course.OrgName
+	ctx.Data["IsCourse"] = ctx.Org.Organization.Name == setting.Course.OrgName
 
 	// Force redirection when username is actually a user.
 	if !org.IsOrganization() {
-- 
2.34.1


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 56/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9#1446,=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E6=88=90=E5=91=98=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E4=B8=BA=E6=96=B0=E5=BB=BA=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=84=E7=BB=87=E5=9B=A2=E9=98=9F=E4=B8=BA=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=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 01d15a4cd0..13d0b05118 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 0000000000..776d550b21
--- /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 40f933e32c..83018739f7 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 13557888c0..d4c5acd620 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 5214c41c3d..9247d8ecea 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>
-- 
2.34.1


From 8b04e3d05d2122f9191d2005578a63f726dd128a Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 24 Jan 2022 16:32:31 +0800
Subject: [PATCH 57/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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_course.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/org/header_course.tmpl b/templates/org/header_course.tmpl
index 776d550b21..ae7cceff34 100644
--- a/templates/org/header_course.tmpl
+++ b/templates/org/header_course.tmpl
@@ -8,7 +8,7 @@
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>
 					{{end}}
 				{{if .IsCourse}}
-					{{if .CanCreateOrgRepo}}
+					{{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>
-- 
2.34.1


From c387aaf3e3f8b71de63a29fe417d87a3495d94b4 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 24 Jan 2022 18:11:58 +0800
Subject: [PATCH 58/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini |  9 +++++----
 options/locale/locale_zh-CN.ini |  1 +
 templates/base/head.tmpl        | 11 +++++------
 templates/base/head_fluid.tmpl  |  6 ++++--
 templates/base/head_home.tmpl   |  6 ++++--
 templates/base/head_pro.tmpl    |  6 ++++--
 templates/org/header.tmpl       |  2 +-
 templates/org/home_courses.tmpl |  6 +++---
 8 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1148f4ae0f..4ef414b997 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -221,6 +221,7 @@ show_only_public = Showing only public
 
 issues.in_your_repos = In your repositories
 contributors = Contributors
+contributor = Contributor
 
 page_title=Explore Better AI
 page_small_title=OpenI AI Development Cooperation Platform
@@ -2041,7 +2042,7 @@ org_full_name_holder = Organization Full Name
 org_name_helper = Organization names should be short and memorable.
 create_org = Create Organization
 repo_updated = Updated
-repo_released = Released
+repo_released = Post
 home = Home
 people = People
 teams = Teams
@@ -2058,8 +2059,8 @@ team_access_desc = Repository access
 team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
-selected_couse=Selected course
-release_course = Contributors
+selected_couse=Selected courses
+release_course = Publish course
 all_keywords=All keywords
 max_selectedPro= Selected up to nine public projects
 custom_select_courses = Custom selected courses 
@@ -2153,7 +2154,7 @@ teams.all_repositories_helper = Team has access to all repositories. Selecting t
 teams.all_repositories_read_permission_desc = This team grants <strong>Read</strong> access to <strong>all repositories</strong>: members can view and clone repositories.
 teams.all_repositories_write_permission_desc = This team grants <strong>Write</strong> access to <strong>all repositories</strong>: members can read from and push to repositories.
 teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</strong> access to <strong>all repositories</strong>: members can read from, push to and add collaborators to repositories.
-teams.join_teams=Join the organization
+teams.join_teams=Join in
 
 [admin]
 dashboard = Dashboard
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 08f11b833e..10a4091d72 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -223,6 +223,7 @@ show_only_public=只显示公开的
 issues.in_your_repos=属于该用户项目的
 
 contributors=贡献者
+contributor=贡献者
 
 page_title=探索更好的AI
 page_small_title=启智AI开发协作平台
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 88b93f1861..740f6482dc 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -200,8 +200,8 @@ var _hmt = _hmt || [];
 			<div class="ui top secondary stackable main menu following bar dark">
 				{{template "base/head_navbar" .}}
 			</div><!-- end bar -->
-			{{if not .IsCourse}}
-				<div  class="notic_content" id ="notic_content"  >
+			<!-- {{if not .IsCourse}} -->
+				<div  class="notic_content" id ="notic_content"  style="display: none;">
 					<a  href={{.notice.Link}} class="a_width">
 						<marquee behavior="scroll" direction="left">
 							{{.notice.Title}}
@@ -209,7 +209,7 @@ var _hmt = _hmt || [];
 					</a>
 					<i class="ri-close-fill x_icon" onclick="closeNoice()"></i>
 				</div>
-			{{end}}
+			<!-- {{end}} -->
 		{{end}}
 {{/*
 	</div>
@@ -249,8 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-
-	if(! ".PageIsInstall") {
+	if( !"{{.IsCourse}}") {
 		isShowNotice();
 	}
-</script>
\ No newline at end of file
+</script>
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index 5878bfb13c..b662977636 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -201,7 +201,7 @@ var _hmt = _hmt || [];
 			<div class="ui top secondary stackable main menu following bar dark">
 				{{template "base/head_navbar_fluid" .}}
 			</div><!-- end bar -->
-			<div  class="notic_content" id ="notic_content"  >
+			<div  class="notic_content" id ="notic_content"   style="display: none;">
 				<a  href={{.notice.Link}} class="a_width">
 					<marquee behavior="scroll" direction="left">
 						{{.notice.Title}}
@@ -248,5 +248,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	isShowNotice();
+	if( !"{{.IsCourse}}") {
+		isShowNotice();
+	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl
index fc5a94c0c7..c818cd46a3 100644
--- a/templates/base/head_home.tmpl
+++ b/templates/base/head_home.tmpl
@@ -205,7 +205,7 @@ var _hmt = _hmt || [];
 			<div class="ui top secondary stackable main menu following bar dark">
 				{{template "base/head_navbar" .}}
 			</div><!-- end bar -->
-			<div  class="notic_content" id ="notic_content"  >
+			<div  class="notic_content" id ="notic_content"  style="display: none;" >
 				<a  href={{.notice.Link}} class="a_width">
 					<marquee behavior="scroll" direction="left">
 						{{.notice.Title}}
@@ -252,5 +252,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	isShowNotice();
+	if( !"{{.IsCourse}}") {
+		isShowNotice();
+	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index 10d86f8092..2801ff95f6 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -201,7 +201,7 @@ var _hmt = _hmt || [];
 			<div class="ui top secondary stackable main menu following bar dark">
 				{{template "base/head_navbar_pro" .}}
 			</div><!-- end bar -->
-			<div  class="notic_content" id ="notic_content"  >
+			<div  class="notic_content" id ="notic_content"  style="display: none;" >
 				<a  href={{.notice.Link}} class="a_width">
 					<marquee behavior="scroll" direction="left">
 						{{.notice.Title}}
@@ -249,5 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	isShowNotice();
+	if( !"{{.IsCourse}}") {
+		isShowNotice();
+	}
 </script>
\ No newline at end of file
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 13d0b05118..bef9cd8b10 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -43,7 +43,7 @@
 			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();
+					$('.alert').html('{{.i18n.Tr "repo.computing.success"}}').removeClass('alert-danger').addClass('alert-success').show().delay(2000).fadeOut();
 				} else {
 					$('.alert').html(data.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(5000).fadeOut();
 				}
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index e9e80b5e64..421ebf2073 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -176,9 +176,9 @@
 														<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
 														<p class="text grey">
 															{{if ne .CreatorID 0}}
-																{{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}}
+																{{$.i18n.Tr "home.contributor"}} : {{.Creator.Name}}
 															{{else}}
-															{{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}}
+															{{$.i18n.Tr "home.contributor"}}:{{.Owner.Name}}
 															{{end}}
 														</p>
 													</div>
@@ -433,7 +433,7 @@
 				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();
+						$('.alert').html('{{.i18n.Tr "repo.computing.success"}}').removeClass('alert-danger').addClass('alert-success').show().delay(2000).fadeOut();
 					} else {
 						$('.alert').html(data.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(5000).fadeOut();
 					}
-- 
2.34.1


From 061b4c544a26142d768675e7a2c79c05d224f520 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 24 Jan 2022 18:19:03 +0800
Subject: [PATCH 59/63] =?UTF-8?q?=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base/head.tmpl       | 2 +-
 templates/base/head_fluid.tmpl | 2 +-
 templates/base/head_home.tmpl  | 2 +-
 templates/base/head_pro.tmpl   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 740f6482dc..c3ee80530b 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -249,7 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( !"{{.IsCourse}}") {
+	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
 		isShowNotice();
 	}
 </script>
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index b662977636..47ee80add3 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -248,7 +248,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( !"{{.IsCourse}}") {
+	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl
index c818cd46a3..f29240083b 100644
--- a/templates/base/head_home.tmpl
+++ b/templates/base/head_home.tmpl
@@ -252,7 +252,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( !"{{.IsCourse}}") {
+	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index 2801ff95f6..7793c7436d 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -249,7 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( !"{{.IsCourse}}") {
+	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
-- 
2.34.1


From 7545272fb5c12b7cf3c53219dc8aeee679e62759 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 25 Jan 2022 10:40:33 +0800
Subject: [PATCH 60/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=AD=E4=BB=A5=E5=8F=8A=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base/head.tmpl        |  2 +-
 templates/base/head_fluid.tmpl  |  2 +-
 templates/base/head_home.tmpl   |  2 +-
 templates/base/head_pro.tmpl    |  2 +-
 templates/org/header.tmpl       |  4 +++-
 templates/org/home_courses.tmpl | 29 ++++++++++++++---------------
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index c3ee80530b..859cacb625 100755
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -249,7 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
+	if(!("{{.IsCourse}}" == true ||  "{{.IsCourse}}" =='true'))  {
 		isShowNotice();
 	}
 </script>
diff --git a/templates/base/head_fluid.tmpl b/templates/base/head_fluid.tmpl
index 47ee80add3..92f606aa2e 100644
--- a/templates/base/head_fluid.tmpl
+++ b/templates/base/head_fluid.tmpl
@@ -248,7 +248,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
+	if(!("{{.IsCourse}}" == true ||  "{{.IsCourse}}" =='true'))  {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_home.tmpl b/templates/base/head_home.tmpl
index f29240083b..9792daf128 100644
--- a/templates/base/head_home.tmpl
+++ b/templates/base/head_home.tmpl
@@ -252,7 +252,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
+	if(!("{{.IsCourse}}" == true ||  "{{.IsCourse}}" =='true'))  {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
diff --git a/templates/base/head_pro.tmpl b/templates/base/head_pro.tmpl
index 7793c7436d..e6dbfc03ee 100644
--- a/templates/base/head_pro.tmpl
+++ b/templates/base/head_pro.tmpl
@@ -249,7 +249,7 @@ var _hmt = _hmt || [];
 			document.getElementById("notic_content").style.display='none'
 		}
 	}
-	if( "{{.IsCourse}}" != true ||  "{{.IsCourse}}" =='') {
+	if(!("{{.IsCourse}}" == true ||  "{{.IsCourse}}" =='true'))  {
 		isShowNotice();
 	}
 </script>
\ No newline at end of file
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index bef9cd8b10..2dc1c35d12 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -47,7 +47,8 @@
 				} else {
 					$('.alert').html(data.error_msg).removeClass('alert-success').addClass('alert-danger').show().delay(5000).fadeOut();
 				}
-				location.reload() 
+				setTimeout("location.reload()",2000);
+				// location.reload() 
 				// if(data.code==0){
 				// 	alert("Join  success")
 				// 	location.reload()  
@@ -57,6 +58,7 @@
 				// } 
 			},
 		});
+		
 	}
 
 </script>
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index 421ebf2073..ef5d4b046d 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -135,11 +135,11 @@
 						</div>
 					
 						<div class="ui sixteen wide mobile six wide tablet four wide computer column">
-							<!-- {{if .CanCreateOrgRepo}} -->
-								<div class=" ui bottom attached segment text center noborder  text center" > 
+							<div class=" ui bottom attached segment text center noborder  text center" > 
+								{{if .IsSigned}}
 									<a style="width: 80%;" class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
-								</div>
-							<!-- {{end}} -->
+								{{end}}
+							</div>
 						</div>
 					</div>
 				</div>
@@ -204,7 +204,9 @@
 								{{end}}
 	
 								<div class="ui bottom attached segment text center noborder"> 
-									<a class="ui blue basic button" onclick="jion_course_team()" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+									{{if .IsSigned}}
+										<a class="ui blue basic button" onclick="jion_course_team()" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+									{{end}}
 								</div>
 							</div>
 							{{if .IsOrganizationMember}}
@@ -424,6 +426,7 @@
 			document.getElementById("recommend").innerHTML=rec +" : "+ show_num
 	
 		}
+
 		function jion_course_team(){
 			$.ajax({
 				type:"GET",
@@ -437,15 +440,11 @@
 					} 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")
-					// } 
-				}
-			});
+					setTimeout("location.reload()",2000);
+				},
+
+			});	
+			
 		}
+		
 	</script>
\ No newline at end of file
-- 
2.34.1


From 50faf7c816dede1ca91ed2a85d41d25a0acccacc Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 25 Jan 2022 11:52:38 +0800
Subject: [PATCH 61/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 4ef414b997..464038ab43 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -269,8 +269,8 @@ org_no_results = No matching organizations found.
 code_no_results = No source code matching your search term found.
 code_search_results = Search results for '%s'
 code_last_indexed_at = Last indexed %s
-save=save
-cancel=cancel
+save=Save
+cancel=Cancel
 
 [auth]
 create_new_account = Register Account
@@ -2063,7 +2063,7 @@ selected_couse=Selected courses
 release_course = Publish course
 all_keywords=All keywords
 max_selectedPro= Selected up to nine public projects
-custom_select_courses = Custom selected courses 
+custom_select_courses = Customize Your Course 
 recommend_remain_pro = Remain
 save_fail_tips = The upper limit is exceeded
 select_again = Select more than 9, please select again!
-- 
2.34.1


From c0b83a41eaa446ea5035d8b718888b3c4c715e09 Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 25 Jan 2022 15:11:01 +0800
Subject: [PATCH 62/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 464038ab43..07818784e8 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2062,8 +2062,8 @@ team_unit_disabled = (Disabled)
 selected_couse=Selected courses
 release_course = Publish course
 all_keywords=All keywords
-max_selectedPro= Selected up to nine public projects
-custom_select_courses = Customize Your Course 
+max_selectedPro= Select up to 9 public projects
+custom_select_courses = Customize selected courses 
 recommend_remain_pro = Remain
 save_fail_tips = The upper limit is exceeded
 select_again = Select more than 9, please select again!
-- 
2.34.1


From 32fee13c9ab19e7f8c8452688487692bb9a73f3a Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Tue, 25 Jan 2022 16:27:41 +0800
Subject: [PATCH 63/63] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 options/locale/locale_en-US.ini  | 7 ++++---
 options/locale/locale_zh-CN.ini  | 3 ++-
 templates/org/home_courses.tmpl  | 6 +++++-
 templates/repo/createCourse.tmpl | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 07818784e8..312ce3a81b 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -354,6 +354,7 @@ courseAlias = Course Name
 courseAdress = Course Path
 RepoPath = Repository path
 RepoAdress = Repository Adress
+course_Adress = Course Address
 Email = Email address
 Password = Password
 Retype = Re-Type Password
@@ -800,7 +801,7 @@ generate_from = Generate From
 repo_desc = Description
 repo_lang = Language
 repo_gitignore_helper = Select .gitignore templates.
-repo_label_helpe = After the input is completed, press the Enter key to complete the label determination.
+repo_label_helpe = Press Enter to complete
 issue_labels = Issue Labels
 issue_labels_helper = Select an issue label set.
 license = License
@@ -2059,8 +2060,8 @@ team_access_desc = Repository access
 team_permission_desc = Permission
 team_unit_desc = Allow Access to Repository Sections
 team_unit_disabled = (Disabled)
-selected_couse=Selected courses
-release_course = Publish course
+selected_couse=Selected Courses
+release_course = Publish Course
 all_keywords=All keywords
 max_selectedPro= Select up to 9 public projects
 custom_select_courses = Customize selected courses 
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 10a4091d72..55e232955b 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -356,9 +356,10 @@ UserName=用户名
 RepoName=项目路径
 Alias=项目名称
 courseAlias=课程名称
-courseAdress=课程地址
+courseAdress=课程路径
 RepoPath=项目路径
 RepoAdress=项目地址
+course_Adress = 课程地址
 Email=邮箱地址
 Password=密码
 Retype=重新输入密码
diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl
index ef5d4b046d..df164bd89b 100644
--- a/templates/org/home_courses.tmpl
+++ b/templates/org/home_courses.tmpl
@@ -138,6 +138,8 @@
 							<div class=" ui bottom attached segment text center noborder  text center" > 
 								{{if .IsSigned}}
 									<a style="width: 80%;" class="ui green button bpadding" href="{{AppSubUrl}}/course/create"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
+								{{else}}
+									<a style="width: 80%;" class="ui green button bpadding" href="{{AppSubUrl}}/user/login"><i class="ri-folder-add-line" style="vertical-align: middle;"></i> &nbsp;{{.i18n.Tr "org.release_course"}} </a>
 								{{end}}
 							</div>
 						</div>
@@ -205,7 +207,9 @@
 	
 								<div class="ui bottom attached segment text center noborder"> 
 									{{if .IsSigned}}
-										<a class="ui blue basic button" onclick="jion_course_team()" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>
+										<a class="ui blue basic button" onclick="jion_course_team()" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>							
+									{{else}}
+										<a class="ui blue basic button" href="{{AppSubUrl}}/user/login" style="width: 80%;"> <i class="ri-user-add-line"></i> {{.i18n.Tr "org.teams.join_teams"}}</a>							
 									{{end}}
 								</div>
 							</div>
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl
index 9247d8ecea..f606d3aa14 100644
--- a/templates/repo/createCourse.tmpl
+++ b/templates/repo/createCourse.tmpl
@@ -42,7 +42,7 @@
                     </div>
                     <span style="display: block;margin-bottom: 1em;" class="help">{{.i18n.Tr "form.repoadd_dash_dot_error"}}</span>
                     <div class="inline field" id="repoAdress" style="display: none;word-break: break-all;">
-                        <label for="">{{.i18n.Tr "form.RepoAdress"}}:</label>
+                        <label for="">{{.i18n.Tr "form.course_Adress"}}:</label>
                         <span style="flex: 1;"></span>
                     </div>
 
-- 
2.34.1