Browse Source

fix issue

tags/v1.22.1.3^2
zhoupzh 3 years ago
parent
commit
9ff89e9db0
4 changed files with 33 additions and 36 deletions
  1. +1
    -0
      options/locale/locale_en-US.ini
  2. +1
    -0
      options/locale/locale_zh-CN.ini
  3. +8
    -10
      templates/org/course_list.tmpl
  4. +23
    -26
      templates/org/home_courses.tmpl

+ 1
- 0
options/locale/locale_en-US.ini View File

@@ -876,6 +876,7 @@ all=All


computing.all = All computing.all = All
computing.Introduction=Introduction computing.Introduction=Introduction
computing.success=Join Success


modelarts.status=Status modelarts.status=Status
modelarts.createtime=CreateTime modelarts.createtime=CreateTime


+ 1
- 0
options/locale/locale_zh-CN.ini View File

@@ -883,6 +883,7 @@ all=所有


computing.all=全部 computing.all=全部
computing.Introduction=简介 computing.Introduction=简介
computing.success=加入成功


modelarts.status=状态 modelarts.status=状态
modelarts.createtime=创建时间 modelarts.createtime=创建时间


+ 8
- 10
templates/org/course_list.tmpl View File

@@ -75,17 +75,14 @@
.card{ .card{
box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60) !important; box-shadow: 0px 4px 4px 0px rgba(232, 232, 232, 60) !important;
border-radius: 5px; border-radius: 5px;
border: 1px solid rgba(232, 232, 232, 100)
border: 1px solid #E8E8E8 !important;
} }


</style> </style>

<div style="width: 100%;"> <div style="width: 100%;">
<div class="ui three cards" style="margin-bottom: 10px;"> <div class="ui three cards" style="margin-bottom: 10px;">
{{range .Repos}} {{range .Repos}}
<div class="card " > <div class="card " >
<div class="extra full_height cor" > <div class="extra full_height cor" >
<div class="content " > <div class="content " >
{{if .Topics }} {{if .Topics }}
@@ -96,9 +93,7 @@
</div> </div>
{{end}} {{end}}
</div> </div>

<div class=" header header_card omit" > <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> <a class="header_card image poping up " href="{{.Link}}" data-content="{{.Alias}}" data-position="top left" data-variation="tiny inverted"> {{.Alias}}</a>
</div> </div>
@@ -106,19 +101,21 @@
<div class='content descript_height nowrap-2'> <div class='content descript_height nowrap-2'>
{{.Description}} {{.Description}}
</div> </div>
</div> </div>
<div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;margin-bottom: 15px;"> <div class=" extra content" style="color:#888888;border-top: none !important;padding-top: 0px;margin-bottom: 15px;">
<div class="left aligned author"> <div class="left aligned author">
<!-- <span > --> <!-- <span > -->
{{if .Creator }} {{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}}"> <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px" src="{{.Creator.RelAvatarLink}}">
</a>
{{else}} {{else}}
<a href="{{.Owner.Name}}" title="{{.Owner.Name}}">
<img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px" src="{{.Owner.RelAvatarLink}}"> <img class="ui avatar image" style="width: 22px;height:22px;margin-top:-5px" src="{{.Owner.RelAvatarLink}}">
</a>
{{end}} {{end}}


{{$.i18n.Tr "org.repo_released"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .CreatedUnix}} {{$.i18n.Tr "org.repo_released"}}&nbsp;: &nbsp; {{TimeSinceUnixShort .CreatedUnix}}
@@ -132,6 +129,7 @@
</div> </div>


<script> <script>
console.log({{.Repos}})
var data; var data;
var filterData=[]; var filterData=[];
var num=0; var num=0;


+ 23
- 26
templates/org/home_courses.tmpl View File

@@ -81,7 +81,10 @@
} }
</style> </style>
{{template "base/head_course" .}} {{template "base/head_course" .}}
<!-- 提示框 -->
<div class="alert"></div>
<div class="organization profile"> <div class="organization profile">
{{/* overflow: auto is the clearfix - this avoids the image going beyond {{/* overflow: auto is the clearfix - this avoids the image going beyond
the container where it is supposed to stay inside. */}} the container where it is supposed to stay inside. */}}
@@ -113,7 +116,7 @@
<div class="ui sixteen wide computer column"> <div class="ui sixteen wide computer column">
<div class="ui mobile reversed stackable grid"> <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> <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}} {{end}}
</div> </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}} --> <!-- {{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> </div>
<!-- {{end}} --> <!-- {{end}} -->
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- 全部 --> <!-- 全部 -->
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="ui sixteen wide computer column"> <div class="ui sixteen wide computer column">
<div class="ui mobile reversed stackable grid"> <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 "org/course_list" .}}
{{template "base/paginate" .}} {{template "base/paginate" .}}
</div> </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"> <h4 class="ui top attached header noborder">
<strong>{{.i18n.Tr "org.selected_couse"}}</strong> <strong>{{.i18n.Tr "org.selected_couse"}}</strong>
<div class="ui right"> <div class="ui right">
<a class="text grey" id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a> <a class="text grey" id="model" onclick="showcreate()">{{svg "octicon-gear" 16}}</a>
</div> </div>
</h4> </h4>
<div class="ui attached table segment course items noborder"> <div class="ui attached table segment course items noborder">
{{ range .tags}} {{ range .tags}}
{{if eq .TagName "精选项目"}} {{if eq .TagName "精选项目"}}
{{range $i, $v := .RepoList}} {{range $i, $v := .RepoList}}
{{if gt $i 0}} {{if gt $i 0}}
<div class="ui divider" style="margin-bottom:10px;"></div> <div class="ui divider" style="margin-bottom:10px;"></div>
{{end}} {{end}}
<div class="item"> <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;"> <div class="content" style="margin-left: 10px;">
<a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a> <a href="{{.Link}}"><strong class="team-name">{{.Alias}}</strong></a>
<p class="text grey"> <p class="text grey">
@@ -182,10 +178,7 @@
{{end}} {{end}}
{{end}} {{end}}
{{end}} {{end}}
</div> </div>
<h4 class="ui top attached header noborder"> <h4 class="ui top attached header noborder">
<strong>{{.i18n.Tr "org.people"}}</strong> <strong>{{.i18n.Tr "org.people"}}</strong>
<div class="ui right"> <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> <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>
</div> </div>
{{if .IsOrganizationMember}} {{if .IsOrganizationMember}}
<div class="ui top attached header noborder"> <div class="ui top attached header noborder">
<strong>{{.i18n.Tr "org.teams"}}</strong> <strong>{{.i18n.Tr "org.teams"}}</strong>
@@ -224,8 +216,8 @@
{{end}} {{end}}
</div> </div>
{{if .IsOrganizationOwner}} {{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> </div>
{{end}} {{end}}
{{end}} {{end}}
@@ -430,13 +422,18 @@
async:false, async:false,
success:function(json){ success:function(json){
data = 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")
// }
} }
}); });
} }

Loading…
Cancel
Save