diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 0398d5655..680106a5a 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -268,7 +268,7 @@ twofa_passcode_incorrect=你的验证码不正确。如果你丢失了你的设 twofa_scratch_token_incorrect=你的验证口令不正确。 login_userpass=登录 login_openid=OpenID -login_cloudbrain=云脑用户登录 +login_cloudbrain=用户登录 oauth_signup_tab=注册帐号 oauth_signup_title=添加电子邮件和密码 (用于帐号恢复) oauth_signup_submit=完成账号 @@ -753,6 +753,7 @@ cloudbrain.new=新建任务 cloudbrain.desc=云脑功能 cloudbrain.cancel=取消 cloudbrain.commit_image=提交 +balance=余额 template.items=模板选项 template.git_content=Git数据(默认分支) diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 9c137d53a..e10e91e34 100755 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -145,6 +145,12 @@ {{end}} + {{if .Permission.CanRead $.UnitTypeBlockChain}} + + {{.i18n.Tr "repo.balance"}} + + {{end}} + {{template "custom/extra_tabs" .}} {{if .Permission.IsAdmin}} diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl old mode 100644 new mode 100755 index 682469a14..a35dacbce --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -188,7 +188,6 @@ {{end}}
#{{.Index}}
{{.Title | RenderEmoji}} - {{if .IsPull }} {{if (index $.CommitStatus .PullRequest.ID)}} {{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl old mode 100644 new mode 100755 index a42a4d9ad..2466dfdfa --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -1,182 +1,224 @@ -
- {{.CsrfTokenHtml}} - {{if .Flash}} -
- {{template "base/alert" .}} -
- {{end}} -
-
-
- - - -
-
- - {{if .PageIsComparePull}} -
{{.i18n.Tr "repo.pulls.title_wip_desc" (index .PullRequestWorkInProgressPrefixes 0| Escape) | Safe}}
- {{end}} -
- {{template "repo/issue/comment_tab" .}} -
- -
-
-
-
-
+ + + {{.CsrfTokenHtml}} + {{if .Flash}} +
+ {{template "base/alert" .}} +
+ {{end}} +
+
+
+ + + +
+
+ + + {{if .PageIsComparePull}} +
{{.i18n.Tr "repo.pulls.title_wip_desc" (index .PullRequestWorkInProgressPrefixes 0| Escape) | Safe}}
+ {{end}} +
-
-
- {{template "repo/issue/branch_selector_field" .}} + + - - -
- {{.i18n.Tr "repo.issues.new.no_label"}} - {{range .Labels}} - {{.Name | RenderEmoji}} - {{end}} - {{range .OrgLabels}} - {{.Name | RenderEmoji}} - {{end}} -
+ {{template "repo/issue/comment_tab" .}} +
+ +
+
+
+
+
-
+
+
+ {{template "repo/issue/branch_selector_field" .}} - - -
- {{.i18n.Tr "repo.issues.new.no_milestone"}} -
- {{if .Milestone}} - {{.Milestone.Name}} - {{end}} -
-
+ + +
+ {{.i18n.Tr "repo.issues.new.no_label"}} + {{range .Labels}} + {{.Name | RenderEmoji}} + {{end}} + {{range .OrgLabels}} + {{.Name | RenderEmoji}} + {{end}} +
-
+
- - -
- - {{.i18n.Tr "repo.issues.new.no_assignees"}} - - {{range .Assignees}} - -  {{.GetDisplayName}} - - {{end}} -
-
-
+ + +
+ {{.i18n.Tr "repo.issues.new.no_milestone"}} +
+ {{if .Milestone}} + {{.Milestone.Name}} + {{end}} +
+
+ +
+ + + +
+ + {{.i18n.Tr "repo.issues.new.no_assignees"}} + + {{range .Assignees}} + +  {{.GetDisplayName}} + + {{end}} +
+
+
+ + {{if .PageIsComparePull}} - + {{end}} - diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index 038241b95..6e38a6f75 100755 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -231,7 +231,7 @@ - @@ -290,7 +290,7 @@
-