Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
pull/2272/head
zouap 3 years ago
parent
commit
09879828aa
3 changed files with 17 additions and 8 deletions
  1. +14
    -5
      routers/home.go
  2. +1
    -1
      templates/explore/repo_right.tmpl
  3. +2
    -2
      templates/user/dashboard/repolist.tmpl

+ 14
- 5
routers/home.go View File

@@ -259,7 +259,11 @@ func ExploreRepos(ctx *context.Context) {
ctx.Data["PageIsExplore"] = true
ctx.Data["PageIsExploreRepositories"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled

pictureInfo, err := getImageInfo("dashboard-picture")
if err == nil && len(pictureInfo) > 0 {
ctx.Data["image_url"] = pictureInfo[0]["url"]
ctx.Data["image_link"] = pictureInfo[0]["image_link"]
}
var ownerID int64
if ctx.User != nil && !ctx.User.IsAdmin {
ownerID = ctx.User.ID
@@ -434,7 +438,11 @@ func ExploreUsers(ctx *context.Context) {
ctx.Data["PageIsExplore"] = true
ctx.Data["PageIsExploreUsers"] = true
ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled

pictureInfo, err := getImageInfo("explore-user-picture")
if err == nil && len(pictureInfo) > 0 {
ctx.Data["image_url"] = pictureInfo[0]["url"]
ctx.Data["image_link"] = pictureInfo[0]["image_link"]
}
RenderUserSearch(ctx, &models.SearchUserOptions{
Actor: ctx.User,
Type: models.UserTypeIndividual,
@@ -668,8 +676,9 @@ func getRecommendOrg() ([]map[string]interface{}, error) {
}
return resultOrg, nil
}
func getImageInfo() ([]map[string]interface{}, error) {
url := setting.RecommentRepoAddr + "picture_info"

func getImageInfo(filename string) ([]map[string]interface{}, error) {
url := setting.RecommentRepoAddr + filename
result, err := repository.RecommendFromPromote(url)

if err != nil {
@@ -759,7 +768,7 @@ func RecommendHomeInfo(ctx *context.Context) {
if err != nil {
log.Info("error." + err.Error())
}
resultImage, err := getImageInfo()
resultImage, err := getImageInfo("picture_info")
if err != nil {
log.Info("error." + err.Error())
}


+ 1
- 1
templates/explore/repo_right.tmpl View File

@@ -1,4 +1,4 @@
<a href="https://openi.org.cn/index.php?m=content&c=index&a=lists&catid=208" target="_blank"><img class="ui mini image" src="https://openi.org.cn/uploadfile/2022/0507/e8bdd42ed598f12.jpg" style="width:100%;"></a>
<a href="{{image_link}}" target="_blank"><img class="ui mini image" src="{{image_url}}" style="width:100%;"></a>

<div class="ui secondary pointing menu">
<div class="active item">


+ 2
- 2
templates/user/dashboard/repolist.tmpl View File

@@ -166,8 +166,8 @@

<div class="ui hidden divider"></div>
<div>
<a href="https://openi.org.cn/index.php?m=content&amp;c=index&amp;a=show&amp;catid=202&amp;id=221" target="_blank">
<img src="https://openi.org.cn/uploadfile/2022/0427/c45291e24e30f54.jpg" class="ui fluid image" alt="">
<a href="{{image_link}}" target="_blank">
<img src="{{image_url}}" class="ui fluid image" alt="">
</a>
</div>
</div>

Loading…
Cancel
Save