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] =?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 0d5c1db14..f5b82df4d 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 aefe62b95..8dce06da1 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 6313ad010..156330ac3 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 e5ab51aa7..a3bd011e9 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 fbcaef2e6..40f933e32 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>