diff --git a/models/org.go b/models/org.go index 8b3e60ef8..28a6701c5 100755 --- a/models/org.go +++ b/models/org.go @@ -208,7 +208,7 @@ func FindTopNMembersOrgs(n int) ([]*OrgScore, error) { } func FindTopNOpenIOrgs(n int) ([]*OrgScore, error) { - sql := "select org_id id,num_score score from org_statistic order by num_score desc limit 10" + strconv.Itoa(n) + sql := "select org_id id,num_score score from org_statistic order by num_score desc limit " + strconv.Itoa(n) return findTopNOrgs(sql) } diff --git a/modules/storage/obs.go b/modules/storage/obs.go index 8e6b4201b..f733eef6c 100755 --- a/modules/storage/obs.go +++ b/modules/storage/obs.go @@ -480,7 +480,7 @@ func GetObsCreateSignedUrlByBucketAndKey(bucket, key string) (string, error) { filename = key[comma+1:] } reqParams := make(map[string]string) - filename = url.QueryEscape(filename) + filename = url.PathEscape(filename) reqParams["response-content-disposition"] = "attachment; filename=\"" + filename + "\"" input.QueryParams = reqParams output, err := ObsCli.CreateSignedUrl(input) @@ -503,6 +503,7 @@ func ObsGetPreSignedUrl(uuid, fileName string) (string, error) { input.Bucket = setting.Bucket input.Expires = 60 * 60 + fileName = url.PathEscape(fileName) reqParams := make(map[string]string) reqParams["response-content-disposition"] = "attachment; filename=\"" + fileName + "\"" input.QueryParams = reqParams diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 933571a0b..e2b75e704 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -279,7 +279,7 @@ func NotebookShow(ctx *context.Context) { } } - datasetDownloadLink := "-" + datasetDownloadLink := "" if ctx.IsSigned { if task.Uuid != "" && task.UserID == ctx.User.ID { attachment, err := models.GetAttachmentByUUID(task.Uuid) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 58615a8e5..6d308161d 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -83,35 +83,43 @@
-

{{$.i18n.Tr "org.star"}}

+

{{$.i18n.Tr "org.star"}}

  • {{ range $i,$user :=.StarOrgs}} -
      +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        +
        • {{end}}
      • -

        {{$user.Name}}

        + {{$user.Name}}
        • -
          +
          •  

            {{$user.Score}}

            • @@ -122,36 +130,44 @@
    • -
    -

    {{$.i18n.Tr "org.member"}}

    +
    +

    {{$.i18n.Tr "org.member"}}

  • - {{ range $i,$user :=.StarOrgs}} -
      + {{ range $i,$user :=.MemberOrgs}} +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        +
        • {{end}}
      • -

        {{$user.Name}}

        + {{$user.Name}}
        • -
          +
          •  

            {{$user.Score}}

            • @@ -162,34 +178,43 @@
    • -
    -

    {{$.i18n.Tr "org.active"}}

    +
    +

    {{$.i18n.Tr "org.active"}}

  • - {{ range $i,$user :=.StarOrgs}} -
      + {{ range $i,$user :=.ActiveOrgs }} +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        + +
        • {{end}}
      • -

        {{$user.Name}}

        + {{$user.Name}}
      @@ -249,3 +274,6 @@ window.onload = function() { } + \ No newline at end of file diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 92f69cec7..4bb049a94 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -119,7 +119,7 @@ td, th { width: 800px; overflow: hidden; text-overflow: ellipsis; - height: 80px; + height: 20%; word-break: break-all; } .redo-color{ diff --git a/web_src/less/openi.less b/web_src/less/openi.less index f6148249e..f7283f69f 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -830,6 +830,7 @@ display: block; font-size: 14px; text-align: center; font-family: SourceHanSansSC-light; + font-weight: normal !important; } .title_re{ margin-top: 50px !important; @@ -881,13 +882,16 @@ display: block; line-height: 28px; } .org_icon{ - margin-top: 10px; + margin-top: 2px; margin-right: 10px; padding-left: 15px; + width: 100% ; + text-align: center ; } -.org_icon_num{ - margin-left: 2px; - margin-right: 13px; +.re_style{ + color: rgba(3, 102, 214, 100) !important; + font-family:SourceHanSansSC-medium; + font-weight: 700; } .org_icon_color{ color: #FA8C16; @@ -904,6 +908,26 @@ display: block; list-style:none; margin-left: 2px; } +.score{ + position:absolute; + width: 50px; + right:50px; + text-align: center; +} +.wi{ + width: 15%; + line-height: 20px; +} + +.title_icon{ + vertical-align: sub; + font-size: 24px; +} +.title_word{ + vertical-align: middle; + font-size: 18px; + margin-top:1px; +} /**seach**/ /**搜索导航条适配窄屏**/ .seachnav{