From c5ce33047e77b03b8d6e289d2b250e15c65ae3d2 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Mon, 1 Sep 2014 00:33:40 +0800 Subject: [PATCH] Mirror fix and hide missing pages for 0.5 release --- conf/locale/locale_zh-CN.ini | 5 +++++ templates/repo/header.tmpl | 4 ++-- templates/repo/home.tmpl | 18 +++++++++--------- .../{gogs_hook.tmpl => hook_gogs.tmpl} | 2 +- templates/repo/settings/hook_new.tmpl | 4 ++-- .../{slack_hook.tmpl => hook_slack.tmpl} | 2 +- templates/repo/settings/nav.tmpl | 2 +- templates/repo/sidebar.tmpl | 12 ++++++------ templates/user/dashboard/nav.tmpl | 10 ++++++---- 9 files changed, 33 insertions(+), 26 deletions(-) rename templates/repo/settings/{gogs_hook.tmpl => hook_gogs.tmpl} (97%) rename templates/repo/settings/{slack_hook.tmpl => hook_slack.tmpl} (95%) diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 21442539ab..55d22f23ee 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -234,6 +234,11 @@ settings.update_webhook = 更新 Web 钩子 settings.update_hook_success = Web 钩子更新成功！ settings.delete_webhook = 删除 Web 钩子 settings.recent_deliveries = 最近推送记录 +settings.hook_type = 钩子类型 +settings.add_slack_hook_desc = 为您的仓库增加 Slack 集成 +settings.slack_token = 令牌 +settings.slack_domain = 域名 +settings.slack_channel = 频道 [org] org_name_holder = 组织名称 diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 6f3d4c66ca..3812508248 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -44,14 +44,14 @@ -
  • + \ No newline at end of file diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 42b8bdd4b1..0947308477 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -9,11 +9,11 @@ {{.Repository.Website}}

    {{if .IsFile}} {{template "repo/view_file" .}} diff --git a/templates/repo/settings/gogs_hook.tmpl b/templates/repo/settings/hook_gogs.tmpl similarity index 97% rename from templates/repo/settings/gogs_hook.tmpl rename to templates/repo/settings/hook_gogs.tmpl index 678d640baf..35b5899532 100644 --- a/templates/repo/settings/gogs_hook.tmpl +++ b/templates/repo/settings/hook_gogs.tmpl @@ -1,4 +1,4 @@ -
    +
    {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index 7a450282b1..2bce97a26b 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -14,8 +14,8 @@ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
    {{template "repo/settings/hook_types" .}} - {{template "repo/settings/gogs_hook" .}} - {{template "repo/settings/slack_hook" .}} + {{template "repo/settings/hook_gogs" .}} + {{template "repo/settings/hook_slack" .}}
    {{if .PageIsSettingsHooksEdit}} diff --git a/templates/repo/settings/slack_hook.tmpl b/templates/repo/settings/hook_slack.tmpl similarity index 95% rename from templates/repo/settings/slack_hook.tmpl rename to templates/repo/settings/hook_slack.tmpl index e68571a081..50d28e2f5e 100644 --- a/templates/repo/settings/slack_hook.tmpl +++ b/templates/repo/settings/hook_slack.tmpl @@ -1,4 +1,4 @@ -
    +
    {{.CsrfTokenHtml}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 6288ca6cd7..ef0765feac 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -5,7 +5,7 @@
  • {{.i18n.Tr "repo.settings.options"}}
  • {{.i18n.Tr "repo.settings.collaboration"}}
  • {{.i18n.Tr "repo.settings.hooks"}}
    • -
  • {{.i18n.Tr "repo.settings.deploy_keys"}}
    • + \ No newline at end of file diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index 39d999cabc..f671bfc1b1 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -3,23 +3,23 @@
  • Issues{{.Repository.NumOpenIssues}}
    • -
  • +
  • {{if .IsViewBranch}}{{.BranchName}}{{else}}{{ShortSha .BranchName}}{{end}}
  • Commits {{.CommitsCount}}
    • -
  • +
  • Releases {{.Repository.NumTags}}
    • -
  • +
  • settings diff --git a/templates/user/dashboard/nav.tmpl b/templates/user/dashboard/nav.tmpl index 6064f35692..c37447d3a6 100644 --- a/templates/user/dashboard/nav.tmpl +++ b/templates/user/dashboard/nav.tmpl @@ -24,21 +24,23 @@
    • {{end}} -
  • +
  • {{.i18n.Tr "new_org"}}
    • + {{if not .ContextUser.IsOrganization}}
  • {{.i18n.Tr "issues"}}
    • -
  • + {{end}} +
  • {{.i18n.Tr "news_feed"}}