diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index 01d15a4cd..13d0b0511 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -8,21 +8,56 @@ {{.DisplayName}} {{end}} - - {{if .IsOrganizationOwner}} -
- {{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}} -
- {{end}} - {{if .CanCreateOrgRepo}} -
- {{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}} -
- {{end}} + {{if .IsCourse}} + {{if .CanCreateOrgRepo}} +
+ {{svg "octicon-plus" 16}} {{.i18n.Tr "org.teams.join_teams"}} +
+ {{end}} + {{else}} + {{if .IsOrganizationOwner}} +
+ {{svg "octicon-plus" 16}} {{.i18n.Tr "org.create_new_team"}} +
+ {{end}} + {{if .CanCreateOrgRepo}} +
+ {{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}} +
+ {{end}} + {{end}} + diff --git a/templates/org/header_course.tmpl b/templates/org/header_course.tmpl new file mode 100644 index 000000000..776d550b2 --- /dev/null +++ b/templates/org/header_course.tmpl @@ -0,0 +1,32 @@ +
+
+
+
+
+ {{with .Org}} + + {{.DisplayName}} + {{end}} + {{if .IsCourse}} + {{if .CanCreateOrgRepo}} + + {{end}} + {{else}} + {{if .IsOrganizationOwner}} + + {{end}} + {{if .CanCreateOrgRepo}} + + {{end}} + {{end}} +
+
+
+
+
\ No newline at end of file diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl index 40f933e32..83018739f 100644 --- a/templates/org/member/course_members.tmpl +++ b/templates/org/member/course_members.tmpl @@ -45,6 +45,8 @@ {{template "base/head" .}} + +
{{template "org/header" .}} {{template "org/navber_course" .}} diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl index 13557888c..d4c5acd62 100644 --- a/templates/org/team/courseTeams.tmpl +++ b/templates/org/team/courseTeams.tmpl @@ -6,7 +6,7 @@ {{template "base/head" .}}
- {{template "org/header" .}} + {{template "org/header_course" .}} {{template "org/navber_course" .}}
diff --git a/templates/repo/createCourse.tmpl b/templates/repo/createCourse.tmpl index 5214c41c3..9247d8ece 100644 --- a/templates/repo/createCourse.tmpl +++ b/templates/repo/createCourse.tmpl @@ -65,7 +65,7 @@ - {{.i18n.Tr "cancel"}} + {{.i18n.Tr "cancel"}}