From 9c8a61851f185fa5bc66036519b905501bf48179 Mon Sep 17 00:00:00 2001 From: openihu Date: Tue, 28 Jun 2022 10:16:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B8=AD=E6=9C=89=E8=B6=85=E9=95=BF=E7=BD=91=E5=9D=80=E8=B6=85?= =?UTF-8?q?=E5=87=BA=E5=86=85=E5=AE=B9=E7=9C=81=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/user/dashboard/feeds.tmpl | 6 +++--- web_src/less/_base.less | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 web_src/less/_base.less diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 82313d736..e43191470 100755 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -111,11 +111,11 @@ {{index .GetIssueInfos 1 | RenderEmoji}} {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} {{.GetIssueTitle | RenderEmoji}} -

{{index .GetIssueInfos 1 | RenderEmoji}}

+

{{index .GetIssueInfos 1 | RenderEmoji}}

{{else if eq .GetOpType 11}} -

{{index .GetIssueInfos 1}}

+

{{index .GetIssueInfos 1}}

{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} - {{.GetIssueTitle | RenderEmoji}} + {{.GetIssueTitle | RenderEmoji}} {{end}}

{{TimeSince .GetCreate $.i18n.Lang}}

diff --git a/web_src/less/_base.less b/web_src/less/_base.less old mode 100644 new mode 100755 index 951cd881e..8d7c052fe --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -489,6 +489,9 @@ code, white-space: nowrap; display: inline-block; } + &.pre-wrap{ + white-space:pre-wrap!important; + } &.thin { font-weight: normal; From a57c114b32cc5d1baff2cfcf38460b246446a508 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 1 Jul 2022 16:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=96=87?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_zh-CN.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 78d80a6bc..847c7b383 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -1473,7 +1473,7 @@ issues.filter_sort.mostforks=派生由多到少 issues.filter_sort.fewestforks=派生由少到多 issues.filter_sort.downloadtimes=下载次数 issues.filter_sort.citations=引用次数 -issues.filter_sort.moststars=收藏数量 +issues.filter_sort.moststars=点赞由多到少 issues.filter_sort.mostusecount=最多引用 issues.filter_sort.fewestusecount=最少引用 From 10be239730706f7d6401d67ffb74cf4b556617ae Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 1 Jul 2022 17:02:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- options/locale/locale_en-US.ini | 1 + options/locale/locale_zh-CN.ini | 2 +- templates/explore/datasets.tmpl | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8b465d3e0..da0854ce7 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -902,6 +902,7 @@ unzip_successed=Unzip Successed unzip_failed=Unzip Failed unzip_stared=Unzipping unzip_status=Unzip Status +collection_num=Collection Nums [repo] owner = Owner repo_name = Repository Name diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index ffa757b92..ff3b1eb83 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -907,7 +907,7 @@ unzip_successed=解压成功 unzip_failed=解压失败 unzip_stared=解压中 unzip_status=解压状态 - +collection_num=收藏数量 [repo] owner=拥有者 repo_name=项目名称 diff --git a/templates/explore/datasets.tmpl b/templates/explore/datasets.tmpl index 327c4fb98..17164cfed 100644 --- a/templates/explore/datasets.tmpl +++ b/templates/explore/datasets.tmpl @@ -154,7 +154,7 @@ {{.i18n.Tr "repo.issues.filter_sort.downloadtimes"}} {{.i18n.Tr "repo.issues.filter_sort.moststars"}} + href="{{$.Link}}?sort=moststars&q={{$.Keyword}}&tab={{$.TabName}}&category={{$.Category}}&task={{$.Task}}&license={{$.License}}&recommend={{$.Recommend}}">{{.i18n.Tr "dataset.collection_num"}} {{.i18n.Tr "repo.issues.filter_sort.mostusecount"}}