From 315fe9e961fee5d461129531d5986391755aa076 Mon Sep 17 00:00:00 2001 From: wangjr Date: Mon, 24 Jan 2022 13:05:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B91439=201437=201434=201433=201?= =?UTF-8?q?431?= 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 75496aed5..88b93f186 100755 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -200,14 +200,16 @@ var _hmt = _hmt || [];
{{template "base/head_navbar" .}}
-
- - - {{.notice.Title}} - - - -
+ {{if not .IsCourse}} +
+ + + {{.notice.Title}} + + + +
+ {{end}} {{end}} {{/* @@ -247,5 +249,8 @@ var _hmt = _hmt || []; document.getElementById("notic_content").style.display='none' } } - isShowNotice(); + + if(! ".PageIsInstall") { + isShowNotice(); + } \ No newline at end of file diff --git a/templates/org/course_list.tmpl b/templates/org/course_list.tmpl index e07fb7d16..a4d140e46 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; + }
@@ -86,9 +94,9 @@
{{if .Topics }} -
+
{{range .Topics}} - {{if ne . "" }}{{.}}{{end}} + {{if ne . "" }}{{.}}{{end}} {{end}}
@@ -127,158 +135,3 @@
- - \ No newline at end of file diff --git a/templates/org/home_courses.tmpl b/templates/org/home_courses.tmpl index 0bafb2cb7..e9e80b5e6 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; + } - {{template "base/head_course" .}} + {{template "base/head" .}}
@@ -131,7 +136,7 @@
-
+
 {{.i18n.Tr "org.release_course"}}
@@ -148,44 +153,49 @@ {{template "base/paginate" .}}
-

- {{.i18n.Tr "org.selected_couse"}} -
- {{svg "octicon-gear" 16}} -
-

-
- {{ range .tags}} - {{if eq .TagName "精选项目"}} - {{range $i, $v := .RepoList}} - {{if gt $i 0}} -
- {{end}} -
- -
- {{.Alias}} -

- {{if ne .CreatorID 0}} - {{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}} - {{else}} - {{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}} - {{end}} -

+ {{if .tags}} +

+ {{.i18n.Tr "org.selected_couse"}} + {{if .IsOrganizationOwner}} +
+ {{svg "octicon-gear" 16}} +
+ {{end}} +

+ +
+ {{ range .tags}} + {{if eq .TagName "精选项目"}} + {{range $i, $v := .RepoList}} + {{if gt $i 0}} +
+ {{end}} +
+ +
+ {{.Alias}} +

+ {{if ne .CreatorID 0}} + {{$.i18n.Tr "home.contributors"}} : {{.Creator.Name}} + {{else}} + {{$.i18n.Tr "home.contributors"}}:{{.Owner.Name}} + {{end}} +

+
-
- + + {{end}} {{end}} {{end}} - {{end}} -
+
+ {{end}}

{{.i18n.Tr "org.people"}}
{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}

-
+
{{$isMember := .IsOrganizationMember}} {{range .Members}} {{if or $isMember (.IsPublicMember $.Org.ID)}} @@ -193,8 +203,8 @@ {{end}} {{end}} - {{if .IsOrganizationMember}} @@ -204,9 +214,9 @@ {{.Org.NumTeams}} {{svg "octicon-chevron-right" 16}}
-
+
{{range .Teams}} -
+
{{.Name}}

{{.NumMembers}} {{$.i18n.Tr "org.lower_members"}} · @@ -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 2c710ec2b..40f933e32 100644 --- a/templates/org/member/course_members.tmpl +++ b/templates/org/member/course_members.tmpl @@ -44,7 +44,7 @@ } -{{template "base/head_course" .}} +{{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 fa7a31548..13557888c 100644 --- a/templates/org/team/courseTeams.tmpl +++ b/templates/org/team/courseTeams.tmpl @@ -4,7 +4,7 @@ border-bottom:none !important } -{{template "base/head_course" .}} +{{template "base/head" .}}
{{template "org/header" .}} {{template "org/navber_course" .}}