From 5f7a306d9c7cbdde3762556d9df8077f94e537c3 Mon Sep 17 00:00:00 2001 From: wangjr Date: Wed, 19 Jan 2022 10:56:27 +0800 Subject: [PATCH] =?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 4c6392276..1f4378036 100644 --- a/templates/org/course_list.tmpl +++ b/templates/org/course_list.tmpl @@ -128,8 +128,14 @@
- - {{$.i18n.Tr "org.repo_updated"}} :   {{TimeSinceUnixShort .UpdatedUnix}} + + {{if .Creator}} + + {{else}} + + {{end}} + + {{$.i18n.Tr "org.repo_updated"}} :   {{TimeSinceUnixShort .UpdatedUnix}}
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl index a2ceaac5f..01d15a4cd 100644 --- a/templates/org/header.tmpl +++ b/templates/org/header.tmpl @@ -25,3 +25,4 @@ + diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl index 771e8e7f9..a06f06c20 100644 --- a/templates/org/home_courses.tmpl +++ b/templates/org/home_courses.tmpl @@ -1,7 +1,9 @@ {{template "base/head" .}}
@@ -113,28 +118,11 @@ {{if .Org.Website}}
{{svg "octicon-link" 16}} {{.Org.Website}}
{{end}}
- -
-
- {{with .Org}} - - {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} - - {{end}} - - {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} - - {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} - - {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} - - {{end}} - {{if .IsOrganizationOwner}}{{svg "octicon-gear" 16}}  组织设置{{end}} -
+
+ + {{template "org/navber_course" .}} - - -
+
{{ range .tags}} {{if eq .TagName "精选项目"}} @@ -232,7 +220,7 @@
-

+

{{.i18n.Tr "org.people"}}
{{.MembersTotal}} {{svg "octicon-chevron-right" 16}} @@ -241,7 +229,7 @@

-
+
{{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.ID)}} @@ -255,13 +243,13 @@
{{if .IsOrganizationMember}} -
+
{{.i18n.Tr "org.teams"}}
{{.Org.NumTeams}} {{svg "octicon-chevron-right" 16}}
-
+
{{range .Teams}}
{{.Name}} @@ -273,7 +261,7 @@ {{end}}
{{if .IsOrganizationOwner}} -
+
{{.i18n.Tr "org.create_new_team"}}
{{end}} diff --git a/templates/org/member/course_members.tmpl b/templates/org/member/course_members.tmpl index 87189c015..74a2e4b7c 100644 --- a/templates/org/member/course_members.tmpl +++ b/templates/org/member/course_members.tmpl @@ -1,9 +1,16 @@ + + {{template "base/head" .}}
{{template "org/header" .}} + {{template "org/navber_course" .}}
{{template "base/alert" .}} - {{template "org/navber" .}}
@@ -67,6 +74,27 @@
{{end}}
+ + {{template "base/paginate" .}}
diff --git a/templates/org/navber_course.tmpl b/templates/org/navber_course.tmpl new file mode 100644 index 000000000..4bd508482 --- /dev/null +++ b/templates/org/navber_course.tmpl @@ -0,0 +1,28 @@ + +
+
+
+ {{with .Org}} + + {{svg "octicon-home" 16}} {{$.i18n.Tr "org.home"}} + + {{end}} + + {{svg "octicon-organization" 16}} {{$.i18n.Tr "org.people"}} + + {{if or ($.IsOrganizationMember) ($.IsOrganizationOwner)}} + + {{svg "octicon-jersey" 16}} {{$.i18n.Tr "org.teams"}} + + {{end}} + {{if .IsOrganizationOwner}}{{svg "octicon-gear" 16}}  组织设置{{end}} +
+ +
+
\ No newline at end of file diff --git a/templates/org/team/courseTeams.tmpl b/templates/org/team/courseTeams.tmpl index e7081b58f..13557888c 100644 --- a/templates/org/team/courseTeams.tmpl +++ b/templates/org/team/courseTeams.tmpl @@ -1,9 +1,17 @@ + {{template "base/head" .}}
{{template "org/header" .}} + {{template "org/navber_course" .}} +
{{template "base/alert" .}} - {{template "org/navber" .}} +